diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js index bbf9d244a..8729d3859 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js @@ -1,7 +1,7 @@ -var config = { - webapi: 'http://localhost:8088/', - web: "http://localhost:8087/"//web地址，用于配置logo -}; +//var config = { +// webapi: 'http://123.57.209.16:31173/', +// web: "http://localhost:8087/"//web地址，用于配置logo +//}; //var config = { // webapi: 'http://112.230.201.53:31173/', // web:"http://112.230.201.53/:8081/"//web地址，用于配置logo @@ -12,17 +12,22 @@ //}; -//var config = { -// webapi: 'http://localhost:8081/', -// web: "http://localhost:8080/"//web地址，用于配置logo -//}; -//var config = { -// webapi: 'http://123.57.209.16:31174/', +var config = { + webapi: 'http://localhost:8081/', + web: "http://localhost:8087/"//web地址，用于配置logo +}; +// var config = { +// webapi: 'http://123.57.209.16:31173/', // web: "http://123.57.209.16:31175/"//web地址，用于配置logo -//}; +// }; //金隅 //var config = { // webapi: 'http://192.168.100.225:31173/', // web:"http://192.168.100.225:8081/"//web地址，用于配置logo -//}; \ No newline at end of file +//}; + +// var config = { +// webapi: 'http://123.57.209.16:31174/', +// web: "http://123.57.209.16:31175/"//web地址，用于配置logo +// }; \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.html index 9b931577d..7521cae2d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.html @@ -1,4 +1,4 @@ -
+
总共0条 @@ -16,7 +16,4 @@
-
\ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.js index a1d65332a..477036bd5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.js @@ -1,4 +1,4 @@ -(function () { +(function () { var multipleData = null; var page = { grid: null, @@ -26,6 +26,7 @@ }, lclass: 'lr-list', loadData: function (param, callback, $page) {// 列表加载后台数据 + console.log(param) var _postParam = { pagination: { rows: param.rows, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js index f606e9a72..6ca0fb479 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js @@ -2,6 +2,7 @@ var page = { isScroll: true, init: function($page, param) { + console.log(param) var path = config.webapi; learun.layer.loading(true,"加载数据中..."); learun.httpget(path + "/learun/ask/paper", { @@ -10,6 +11,7 @@ learun.layer.loading(false); $page.find('.inSecTitle').html(res.VTitle).end().find('.inSecTime').html(res.VStartTime + ' - ' + res.VStopTime) var dataList = res.Ask_Questions; + console.log(dataList) var otherHtml = '
'+ '其他'+ '
'+ @@ -92,7 +94,7 @@ return } // return - learun.httpget(path + "/learun/ask/savepaper", + learun.httppost(path + "/learun/ask/savepaper", { VID: param.VID, LessonNo: param.LessonNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js index 33135cc3e..27e5d334f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-10-17 17:22 @@ -144,6 +144,7 @@ }); } learun.httpget(config.webapi + 'learun/AssetManagementSystem/InventoryItem/pagelist', _postParam, (data) => { + console.log(data) $page.find('.lr-badge').text('0'); if (data) { $page.find('.lr-badge').text(data.records); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js index 96450d451..8d426ba9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-10-24 16:51 @@ -89,6 +89,7 @@ var _postData = {} _postData.keyValue = keyValue; _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + console.log(_postData) learun.layer.loading(true, '正在提交数据'); learun.httppost(config.webapi + 'learun/AssetManagementSystem/InventoryItem/save', _postData, (data) => { learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form/form.js index 8830da9a6..8476450d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form/form.js @@ -1,4 +1,4 @@ -(function () { +(function () { var keyValue = ''; var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; var $header = null; @@ -31,11 +31,11 @@ config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/GetApplyResult', _postData, - ( - dataresult, inforesult) => { + (dataresult, inforesult) => { learun.layer.loading(false); clearInterval(timer); - learun.layer.toast(inforesult); + //learun.layer.toast(inforesult); + learun.layer.toast(dataresult.msg); learun.nav.closeCurrent(); var prepage = learun.nav.getpage('EducationalAdministration/OpenLessonPlanOfElectiveStudent'); prepage.grid.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js index 773b795ec..3b5be792c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js @@ -1,4 +1,4 @@ -(function () { +(function () { var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; var begin = ''; var end = ''; @@ -13,6 +13,7 @@ lclass: page.lclass, rows: 10, // 每页行数 getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + console.log(param) param.multipleData = multipleData; page.loadData(param, callback, $page); }, @@ -48,6 +49,7 @@ _postParam.queryJson = JSON.stringify({ StuNo: JSON.parse(localStorage.userinfo).baseinfo.account, StuMajorNo: JSON.parse(localStorage.userinfo).baseinfo.majorno, StuGrade: JSON.parse(localStorage.userinfo).baseinfo.grade }); } learun.httpget(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, (data) => { + console.log(data) $page.find('.lr-badge').text('0'); if (data) { $page.find('.lr-badge').text(data.records); @@ -116,9 +118,15 @@ _postData.keyValue = item.Id; _postData.StuNo = JSON.parse(localStorage.userinfo).baseinfo.account; learun.layer.loading(true, '正在取消报名...'); + console.log(123); learun.httppost(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/CancelPre', _postData, (data, info) => { + console.log(data) + console.log(info) if (data) {// 成功 - learun.layer.toast(info); + console.log(1111111111) + console.log(data) + console.log(info) + //learun.layer.toast(info); page.grid.reload(); } learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/form/form.js index fa3702041..91bd59fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/form/form.js @@ -1,4 +1,4 @@ -(function () { +(function () { var keyValue = ''; var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; var $header = null; @@ -26,7 +26,8 @@ learun.httppost(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/SignInPre', _postData, (data,info) => { learun.layer.loading(false); if (data) {// 表单数据保存成功 - learun.layer.toast(info); + //learun.layer.toast(info); + learun.layer.toast(data.msg); learun.nav.closeCurrent(); var prepage = learun.nav.getpage('EducationalAdministration/OpenLessonPlanOfElectiveStudentPre'); prepage.grid.reload(); @@ -35,10 +36,12 @@ }); page.bind($page, param); if (keyValue) { + console.log(keyValue) $page.find('.lr-form-container').setFormRead(); // 获取表单数据 learun.layer.loading(true, '获取表单数据'); learun.httpget(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form', keyValue, (data) => { + console.log(data) if (data) { for (var id in data) { if (data[id].length) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/R_EnterBuilding.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/R_EnterBuilding.js index c4a9ca181..c9e5bfda1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/R_EnterBuilding.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/R_EnterBuilding.js @@ -1,104 +1,99 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2020-04-21 09:23 * 描 述：扫码入教学楼统计 */ -(function () { - var page = { - grid: null, - init: function ($page) { - - - - - var ua = navigator.userAgent.toLowerCase(); - if (/(html5plus)/i.test(ua)) { - //if (false) { - $('.bcidBox').css('display', 'block'); - var scan = new plus.barcode.Barcode('bcid'); - scan.onmarked = function onmarked(type, result) { - scan.close(); - $('.bcidBox').css('display', 'none'); - - var loginInfo = learun.storage.get('userinfo'); - var buildEntity = {}; - buildEntity.SId = loginInfo.baseinfo.account; - - buildEntity.BId = result;//'1d13cb80-d66a-4c55-a633-f88dc0b80df7'; - - var param = {}; - param.keyValue = ''; - param.strEntity = JSON.stringify(buildEntity); - - - learun.layer.loading(true, '正在提交数据'); - learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => { - learun.layer.loading(false); - if (data) {// 表单数据保存成功 - learun.layer.toast("扫描成功"); - learun.nav.closeCurrent(); - //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding'); - //prepage.grid.reload(); - } - }); - }; - scan.start(); - } else if (/micromessenger/.test(ua)) { - $.ajax({ - url: config.webapi + "weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href), - type: "get", - success: function (res) { - wx.config({ - debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 - appId: res.data.appid, // 必填，公众号的唯一标识 - timestamp: res.data.timestamp, // 必填，生成签名的时间戳 - nonceStr: res.data.noncestr, // 必填，生成签名的随机串 - signature: res.data.certificate, // 必填，签名 - jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表 - }); - - wx.ready(function () { - wx.scanQRCode({ - needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有 - success: function (res) { - learun.layer.toast(res); - //res.resultStr - var loginInfo = learun.storage.get('userinfo'); - var buildEntity = {}; - buildEntity.SId = loginInfo.baseinfo.account; - - buildEntity.BId = res.resultStr;//'1d13cb80-d66a-4c55-a633-f88dc0b80df7'; - - var param = {}; - param.keyValue = ''; - param.strEntity = JSON.stringify(buildEntity); - - - learun.layer.loading(true, '正在提交数据'); - learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => { - learun.layer.loading(false); - if (data) {// 表单数据保存成功 - learun.layer.toast("扫描成功"); - learun.nav.closeCurrent(); - //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding'); - //prepage.grid.reload(); - } - }); - } - }); - }) - - - } - }); - - - } else { - learun.layer.warning('请下载app或者到微信浏览器打开网页'); - } - } - }; - return page; +(function() { + var page = { + grid: null, + init: function($page) { + var ua = navigator.userAgent.toLowerCase(); + if (/(html5plus)/i.test(ua)) { + //if (false) { + $('.bcidBox').css('display', 'block'); + var scan = new plus.barcode.Barcode('bcid'); + scan.onmarked = function onmarked(type, result) { + scan.close(); + $('.bcidBox').css('display', 'none'); + + var loginInfo = learun.storage.get('userinfo'); + var buildEntity = {}; + buildEntity.SId = loginInfo.baseinfo.account; + + buildEntity.BId = result; //'1d13cb80-d66a-4c55-a633-f88dc0b80df7'; + + var param = {}; + param.keyValue = ''; + param.strEntity = JSON.stringify(buildEntity); + + + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => { + learun.layer.loading(false); + if (data) { // 表单数据保存成功 + learun.layer.toast("扫描成功"); + learun.nav.closeCurrent(); + //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding'); + //prepage.grid.reload(); + } + }); + }; + scan.start(); + } else if (/micromessenger/.test(ua)) { + $.ajax({ + url: config.webapi + "weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href), + type: "get", + success: function(res) { + wx.config({ + debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 + appId: res.data.appid, // 必填，公众号的唯一标识 + timestamp: res.data.timestamp, // 必填，生成签名的时间戳 + nonceStr: res.data.noncestr, // 必填，生成签名的随机串 + signature: res.data.certificate, // 必填，签名 + jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表 + }); + + wx.ready(function() { + wx.scanQRCode({ + needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果， + scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有 + success: function(res) { + learun.layer.toast(res); + //res.resultStr + var loginInfo = learun.storage.get('userinfo'); + var buildEntity = {}; + buildEntity.SId = loginInfo.baseinfo.account; + + buildEntity.BId = res.resultStr; //'1d13cb80-d66a-4c55-a633-f88dc0b80df7'; + + var param = {}; + param.keyValue = ''; + param.strEntity = JSON.stringify(buildEntity); + + + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, ( + data) => { + learun.layer.loading(false); + if (data) { // 表单数据保存成功 + learun.layer.toast("扫描成功"); + learun.nav.closeCurrent(); + //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding'); + //prepage.grid.reload(); + } + }); + } + }); + }) + } + }); + + + } else { + learun.layer.warning('请下载app或者到微信浏览器打开网页'); + } + } + }; + return page; })(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/R_EnterSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/R_EnterSchool.js index a66f2624d..66f7f5a63 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/R_EnterSchool.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/R_EnterSchool.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2020-04-21 09:27 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js index 2a85df13b..baf19c4f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-12-26 14:43 @@ -71,6 +71,8 @@ if (param.begin && param.end) { _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end }); } + console.log(param.multipleData) + // return learun.httpget(config.webapi + 'StuInfoFresh/pageList', _postParam, (data) => { $page.find('.lr-badge').text('0'); if (data) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js index 1b9f3015a..e80751769 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-12-26 14:43 @@ -91,6 +91,8 @@ var _postData = {} _postData.keyValue = keyValue; _postData.strEntity = JSON.stringify(data); + console.log(_postData) + // return learun.layer.loading(true, '正在提交数据'); learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => { learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/AbNormalSerious.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/AbNormalSerious.css index d79970a72..f92d126ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/AbNormalSerious.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/AbNormalSerious.css @@ -1,149 +1,149 @@ -#sQrCode { - height: 100%; - background-color: #EEF2F3; - padding-bottom: 30px; +#sQrCode { + height: 100%; + background-color: #EEF2F3; + padding-bottom: 30px; } .sQrLogo { - background-image: url(images/xcBg.jpg); - background-size: 100% 100%; - text-align: center; - line-height: 0; - padding: 20px 0 70px; + background-image: url(images/xcBg.jpg); + background-size: 100% 100%; + text-align: center; + line-height: 0; + padding: 20px 0 70px; } .sQrLogoImg1 img { - width: 20%; + width: 20%; } .sQrLogoImg1 { - margin-bottom: 10px; + margin-bottom: 10px; } .sQrLogoImg2 img { - width: 50%; + width: 50%; } .sQrBox { - margin: -50px 20px 0; - background-color: #fff; - padding: 30px 38px; - border-radius: 10px; - -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - /* overflow: hidden; */ + margin: -50px 20px 0; + background-color: #fff; + padding: 30px 38px; + border-radius: 10px; + -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + /* overflow: hidden; */ } .sQrT2 { - font-weight: bold; - text-align: center; - font-size: 24px; - margin-bottom: 20px; - color: #CC0000; + font-weight: bold; + text-align: center; + font-size: 24px; + margin-bottom: 20px; + color: #CC0000; } .sQrList { - background-color: #F8F8F8; - margin: 0 10px; - padding: 10px 30px; - border-radius: 4px + background-color: #F8F8F8; + margin: 0 10px; + padding: 10px 30px; + border-radius: 4px } - .sQrList div { - padding: 7px 10px; - font-size: 14px; - color: #000; - border-top: 1px solid #D7D7D7; - } +.sQrList div { + padding: 7px 10px; + font-size: 14px; + color: #000; + border-top: 1px solid #D7D7D7; +} - .sQrList div:first-child { - border: 0; - } +.sQrList div:first-child { + border: 0; +} - .sQrList div span { - color: #AEAEAE; - margin-right: 10px; - } +.sQrList div span { + color: #AEAEAE; + margin-right: 10px; +} .sQrType3 { - background-color: #CC0000; - padding: 20px 0; - text-align: center; - color: #fff; - margin: 30px -38px -30px; - border-radius: 0 0 10px 10px; + background-color: #CC0000; + padding: 20px 0; + text-align: center; + color: #fff; + margin: 30px -38px -30px; + border-radius: 0 0 10px 10px; } - .sQrType3 > * { - display: inline-block; - vertical-align: middle; - text-align: left; - } +.sQrType3>* { + display: inline-block; + vertical-align: middle; + text-align: left; +} .sQrTypeT { - font-size: 14px; + font-size: 14px; } .sQrTypeTxt { - font-size: 24px; - font-weight: bold; - margin-top: 3px; + font-size: 24px; + font-weight: bold; + margin-top: 3px; } .sQrTypeImg { - margin-left: 15px; - width: 43px; - line-height: 0; + margin-left: 15px; + width: 43px; + line-height: 0; } - .sQrTypeImg img { - width: 100%; - } +.sQrTypeImg img { + width: 100%; +} .sQrTxt1 { - margin: 30px 50px 20px; - font-size: 14px; - color: #AEAEAE; + margin: 30px 50px 20px; + font-size: 14px; + color: #AEAEAE; } .sQrBtn2 { - margin: 20px 20px 0; - background-color: #CED0D0; - /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); + margin: 20px 20px 0; + background-color: #CED0D0; + /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1); box-shadow: 0 0 10px rgba(0, 0, 0, .1); */ - border-radius: 8px; - height: 50px; - line-height: 50px; - font-weight: bold; - color: #fff; - font-size: 16px; - text-align: center; -} - - .sQrBtn2 img { - width: 23px; - margin-right: 10px; - position: relative; - top: 2px; - } + border-radius: 8px; + height: 50px; + line-height: 50px; + font-weight: bold; + color: #fff; + font-size: 16px; + text-align: center; +} + +.sQrBtn2 img { + width: 23px; + margin-right: 10px; + position: relative; + top: 2px; +} .sQrType3 .sQrTypePhoto { - border: 4px solid #CC0000; - border-radius: 4px; - width: 85px; - margin: -30px 10px -30px 0; - background: #fff; + border: 4px solid #CC0000; + border-radius: 4px; + width: 85px; + margin: -30px 10px -30px 0; + background: #fff; } .sQrTypePhoto div { - height: 0; - overflow: hidden; - padding-bottom: 139.516129%; - line-height: 0; + height: 0; + overflow: hidden; + padding-bottom: 139.516129%; + line-height: 0; } .sQrTypePhoto img { - width: 100%; + width: 100%; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.css index 03f57ea17..1ed8ff0c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.css @@ -1,149 +1,149 @@ -#sQrCode { - height: 100%; - background-color: #EEF2F3; - padding-bottom: 30px; +#sQrCode { + height: 100%; + background-color: #EEF2F3; + padding-bottom: 30px; } .sQrLogo { - background-image: url(images/xcBg.jpg); - background-size: 100% 100%; - text-align: center; - line-height: 0; - padding: 20px 0 70px; + background-image: url(images/xcBg.jpg); + background-size: 100% 100%; + text-align: center; + line-height: 0; + padding: 20px 0 70px; } .sQrLogoImg1 img { - width: 20%; + width: 20%; } .sQrLogoImg1 { - margin-bottom: 10px; + margin-bottom: 10px; } .sQrLogoImg2 img { - width: 50%; + width: 50%; } .sQrBox { - margin: -50px 20px 0; - background-color: #fff; - padding: 30px 38px; - border-radius: 10px; - -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - /* overflow: hidden; */ + margin: -50px 20px 0; + background-color: #fff; + padding: 30px 38px; + border-radius: 10px; + -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + /* overflow: hidden; */ } .sQrT2 { - font-weight: bold; - text-align: center; - font-size: 24px; - margin-bottom: 20px; - color: #F8B500; + font-weight: bold; + text-align: center; + font-size: 24px; + margin-bottom: 20px; + color: #F8B500; } .sQrList { - background-color: #F8F8F8; - margin: 0 10px; - padding: 10px 30px; - border-radius: 4px + background-color: #F8F8F8; + margin: 0 10px; + padding: 10px 30px; + border-radius: 4px } - .sQrList div { - padding: 7px 10px; - font-size: 14px; - color: #000; - border-top: 1px solid #D7D7D7; - } +.sQrList div { + padding: 7px 10px; + font-size: 14px; + color: #000; + border-top: 1px solid #D7D7D7; +} - .sQrList div:first-child { - border: 0; - } +.sQrList div:first-child { + border: 0; +} - .sQrList div span { - color: #AEAEAE; - margin-right: 10px; - } +.sQrList div span { + color: #AEAEAE; + margin-right: 10px; +} .sQrType2 { - background-color: #F8B500; - padding: 20px 0; - text-align: center; - color: #fff; - margin: 30px -38px -30px; - border-radius: 0 0 10px 10px; + background-color: #F8B500; + padding: 20px 0; + text-align: center; + color: #fff; + margin: 30px -38px -30px; + border-radius: 0 0 10px 10px; } - .sQrType2 > * { - display: inline-block; - vertical-align: middle; - text-align: left; - } +.sQrType2>* { + display: inline-block; + vertical-align: middle; + text-align: left; +} .sQrTypeT { - font-size: 14px; + font-size: 14px; } .sQrTypeTxt { - font-size: 24px; - font-weight: bold; - margin-top: 3px; + font-size: 24px; + font-weight: bold; + margin-top: 3px; } .sQrTypeImg { - margin-left: 15px; - width: 43px; - line-height: 0; + margin-left: 15px; + width: 43px; + line-height: 0; } - .sQrTypeImg img { - width: 100%; - } +.sQrTypeImg img { + width: 100%; +} .sQrTxt1 { - margin: 30px 50px 20px; - font-size: 14px; - color: #AEAEAE; + margin: 30px 50px 20px; + font-size: 14px; + color: #AEAEAE; } .sQrBtn3 { - margin: 20px 20px 0; - background-color: #CED0D0; - /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); + margin: 20px 20px 0; + background-color: #CED0D0; + /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1); box-shadow: 0 0 10px rgba(0, 0, 0, .1); */ - border-radius: 8px; - height: 50px; - line-height: 50px; - font-weight: bold; - color: #fff; - font-size: 16px; - text-align: center; -} - - .sQrBtn3 img { - width: 23px; - margin-right: 10px; - position: relative; - top: 2px; - } + border-radius: 8px; + height: 50px; + line-height: 50px; + font-weight: bold; + color: #fff; + font-size: 16px; + text-align: center; +} + +.sQrBtn3 img { + width: 23px; + margin-right: 10px; + position: relative; + top: 2px; +} .sQrType2 .sQrTypePhoto { - border: 4px solid #F8B500; - border-radius: 4px; - width: 85px; - margin: -30px 10px -30px 0; - background: #fff; + border: 4px solid #F8B500; + border-radius: 4px; + width: 85px; + margin: -30px 10px -30px 0; + background: #fff; } .sQrTypePhoto div { - height: 0; - overflow: hidden; - padding-bottom: 139.516129%; - line-height: 0; + height: 0; + overflow: hidden; + padding-bottom: 139.516129%; + line-height: 0; } .sQrTypePhoto img { - width: 100%; + width: 100%; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.js index 43251ef68..f22754d14 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.js @@ -1,4 +1,4 @@ -(function () { +(function () { var $header = null; var stuNo = ''; var page = { @@ -7,7 +7,7 @@ stuNo = param.stuNo; // 添加头部按钮列表 $header = $page.parents('.f-page').find('.f-page-header'); - learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) { + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) { console.log(data); $('.sQrList div strong').eq(0).html(data.stuInfo.StuName); $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName); @@ -19,7 +19,6 @@ $('.sQrTypePhoto img').attr('src', config.web + data.stuInfo.Photo); } else { if (data.stuInfo.GenderNo) { - $('.sQrTypePhoto img').attr('src', '/images/on-boy.jpg'); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/Normal/Normal.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/Normal/Normal.css index 8c274f680..4d6463f60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/Normal/Normal.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/Normal/Normal.css @@ -1,149 +1,149 @@ -#sQrCode { - height: 100%; - background-color: #EEF2F3; - padding-bottom: 30px; +#sQrCode { + height: 100%; + background-color: #EEF2F3; + padding-bottom: 30px; } .sQrLogo { - background-image: url(images/xcBg.jpg); - background-size: 100% 100%; - text-align: center; - line-height: 0; - padding: 20px 0 70px; + background-image: url(images/xcBg.jpg); + background-size: 100% 100%; + text-align: center; + line-height: 0; + padding: 20px 0 70px; } .sQrLogoImg1 img { - width: 20%; + width: 20%; } .sQrLogoImg1 { - margin-bottom: 10px; + margin-bottom: 10px; } .sQrLogoImg2 img { - width: 50%; + width: 50%; } .sQrBox { - margin: -50px 20px 0; - background-color: #fff; - padding: 30px 38px; - border-radius: 10px; - -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - box-shadow: 0 4px 10px rgba(0, 0, 0, .1); - /* overflow: hidden; */ + margin: -50px 20px 0; + background-color: #fff; + padding: 30px 38px; + border-radius: 10px; + -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + box-shadow: 0 4px 10px rgba(0, 0, 0, .1); + /* overflow: hidden; */ } .sQrT2 { - font-weight: bold; - text-align: center; - font-size: 24px; - margin-bottom: 20px; - color: #21A737; + font-weight: bold; + text-align: center; + font-size: 24px; + margin-bottom: 20px; + color: #21A737; } .sQrList { - background-color: #F8F8F8; - margin: 0 10px; - padding: 10px 30px; - border-radius: 4px + background-color: #F8F8F8; + margin: 0 10px; + padding: 10px 30px; + border-radius: 4px } - .sQrList div { - padding: 7px 10px; - font-size: 14px; - color: #000; - border-top: 1px solid #D7D7D7; - } +.sQrList div { + padding: 7px 10px; + font-size: 14px; + color: #000; + border-top: 1px solid #D7D7D7; +} - .sQrList div:first-child { - border: 0; - } +.sQrList div:first-child { + border: 0; +} - .sQrList div span { - color: #AEAEAE; - margin-right: 10px; - } +.sQrList div span { + color: #AEAEAE; + margin-right: 10px; +} .sQrType1 { - background-color: #21A737; - padding: 20px 0; - text-align: center; - color: #fff; - margin: 30px -38px -30px; - border-radius: 0 0 10px 10px; + background-color: #21A737; + padding: 20px 0; + text-align: center; + color: #fff; + margin: 30px -38px -30px; + border-radius: 0 0 10px 10px; } - .sQrType1 > * { - display: inline-block; - vertical-align: middle; - text-align: left; - } +.sQrType1>* { + display: inline-block; + vertical-align: middle; + text-align: left; +} .sQrTypeT { - font-size: 14px; + font-size: 14px; } .sQrTypeTxt { - font-size: 24px; - font-weight: bold; - margin-top: 3px; + font-size: 24px; + font-weight: bold; + margin-top: 3px; } .sQrTypeImg { - margin-left: 15px; - width: 43px; - line-height: 0; + margin-left: 15px; + width: 43px; + line-height: 0; } - .sQrTypeImg img { - width: 100%; - } +.sQrTypeImg img { + width: 100%; +} .sQrTxt1 { - margin: 30px 50px 20px; - font-size: 14px; - color: #AEAEAE; + margin: 30px 50px 20px; + font-size: 14px; + color: #AEAEAE; } .sQrBtn1 { - margin: 20px 20px 0; - background-color: #fff; - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1); - box-shadow: 0 0 10px rgba(0, 0, 0, .1); - border-radius: 8px; - height: 50px; - line-height: 50px; - font-weight: bold; - color: #339933; - font-size: 16px; - text-align: center; -} - - .sQrBtn1 img { - width: 23px; - margin-right: 10px; - position: relative; - top: 2px; - } + margin: 20px 20px 0; + background-color: #fff; + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1); + box-shadow: 0 0 10px rgba(0, 0, 0, .1); + border-radius: 8px; + height: 50px; + line-height: 50px; + font-weight: bold; + color: #339933; + font-size: 16px; + text-align: center; +} + +.sQrBtn1 img { + width: 23px; + margin-right: 10px; + position: relative; + top: 2px; +} .sQrType1 .sQrTypePhoto { - border: 4px solid #21A737; - border-radius: 4px; - width: 85px; - margin: -30px 10px -30px 0; - background: #fff; + border: 4px solid #21A737; + border-radius: 4px; + width: 85px; + margin: -30px 10px -30px 0; + background: #fff; } .sQrTypePhoto div { - height: 0; - overflow: hidden; - padding-bottom: 139.516129%; - line-height: 0; + height: 0; + overflow: hidden; + padding-bottom: 139.516129%; + line-height: 0; } .sQrTypePhoto img { - width: 100%; + width: 100%; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.html index 0a3e48a65..080caba4a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.html @@ -1,11 +1,6 @@ -
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.js index a0f88bff7..8cf9a80cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.js @@ -1,4 +1,4 @@ -(function () { +(function () { var keyValue = ''; var $header = null; var page = { @@ -22,18 +22,18 @@ var logininfo = learun.storage.get('userinfo'); //learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',logininfo.baseinfo.account, function (data) { - ////learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail','2018010108', function (data) { - // console.log(data); - // $('.sQrList div strong').eq(0).html(data.stuInfo.StuName); - // $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName); - // $('.sQrList div strong').eq(2).html(data.classInfo.ClassName); - // $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo); - // $('.sQrList div strong').eq(4).html(data.roomInfo); - // //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片 + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail','2018010108', function (data) { + console.log(data); + $('.sQrList div strong').eq(0).html(data.stuInfo.StuName); + $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName); + $('.sQrList div strong').eq(2).html(data.classInfo.ClassName); + $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo); + $('.sQrList div strong').eq(4).html(data.roomInfo); + //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片 - // learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo }); - //}) - learun.code.encode({ id: 'lr_mycode_qrcode', text: '2019010211' }); + learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo }); + }) + //learun.code.encode({ id: 'lr_mycode_qrcode', text: '2019010211' }); }, bind: function ($page, param) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.html new file mode 100644 index 000000000..b33844114 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.html @@ -0,0 +1,23 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.js new file mode 100644 index 000000000..b839297d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaint.js @@ -0,0 +1,129 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：接收投诉意见 + */ +(function () { + var begin = ''; + var end = ''; + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + begin = ''; + end = ''; + multipleData = null; + page.grid = $page.find('#lr_EducationalAdministrationSys_ReceiveComplaint_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.begin = begin; + param.end = end; + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-danger')) { + page.btnClick(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + }, + btns: page.rowBtns + }); + // 时间搜索 + $page.find('.lr_time_search').searchdate({ + callback: function (_begin, _end) { + begin = _begin; + end = _end; + multipleData = null; + page.grid.reload(); + } + }); + // 多条件查询 + var $multiple = $page.find('.lr_multiple_search').multiplequery({ + callback: function (data) { + begin = ''; + end = ''; + multipleData = data || {}; + page.grid.reload(); + } + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page, + sidx: 'SendTime desc', + sord: 'DESC' + }, + queryJson: JSON.stringify({ ReceiverId: learun.storage.get('userinfo').baseinfo.userId }) + + }; + if (param.multipleData) { + multipleData.ReceiverId = learun.storage.get('userinfo').baseinfo.userId; + _postParam.queryJson = JSON.stringify(multipleData); + } + if (param.begin && param.end) { + _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, ReceiverId: learun.storage.get('userinfo').baseinfo.userId }); + } + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveComplaint/pagelist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

投诉编号:

').dataFormatter({ value: _item.ComplaintCode })); + _$item.append($('

主题:

').dataFormatter({ value: _item.Title })); + _$item.append($('

指派人:

').dataFormatter({ value: _item.Sender })); + _$item.append($('

指派时间:

').dataFormatter({ + value: _item.SendTime, + type: 'datetime', + dateformat: 'yyyy-MM-dd hh:mm:ss' + })); + _$item.append($('

回复状态:

').dataFormatter({ value: _item.ReplyFlag == 1 ? "已回复" : "未回复" })); + _$item.append($('

回复时间:

').dataFormatter({ + value: _item.ReplyTime, + type: 'datetime', + dateformat: 'yyyy-MM-dd hh:mm:ss' + })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + learun.nav.go({ path: 'EducationalAdministration/Sys_ReceiveComplaint/form', title: '详情', type: 'right', param: { keyValue: item.RComplaintId, ReplyFlag: item.ReplyFlag } }); + }, + btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.ReplyFlag !== 1) { + learun.layer.warning("当前投诉意见未回复，无法删除！"); + return false; + } + learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在删除该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveComplaint/delete', item.RComplaintId, (data) => { + if (data) {// 删除数据成功 + page.grid.reload(); + } + learun.layer.loading(false); + }); + } + }, '智慧校园提示', ['取消', '确定']); + }, + rowBtns: ['删除'] // 列表行左滑按钮 + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.html new file mode 100644 index 000000000..b821b2cf9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.html @@ -0,0 +1,17 @@ +
+
+ * + + +
+
+ * + + +
+
+ * + + +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.js new file mode 100644 index 000000000..c0db12e83 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveComplaint/form/form.js @@ -0,0 +1,154 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：接收投诉意见 + */ +(function () { + var keyValue = ''; + var ReplyFlag = '';//回复状态 + var $header = null; + var titleText = ''; + var page = { + isScroll: true, + init: function ($page, param) { + keyValue = param.keyValue; + ReplyFlag = param.ReplyFlag; + // 添加头部按钮列表 + var _html = '\ +
取消
\ +
\ +
\ +
\ +
\ +
提交
'; + $header = $page.parents('.f-page').find('.f-page-header'); + $header.append(_html); + // 取消 + $header.find('.lr-form-header-cancel').on('tap', function () { + learun.layer.confirm('确定要退出当前编辑？', function (_index) { + if (_index === '1') { + if (keyValue) {// 如果是编辑状态 + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是新增状态 关闭当前页面 + learun.nav.closeCurrent(); + } + } + }, '智慧校园提示', ['取消', '确定']); + }); + // 编辑 + $header.find('.lr-form-header-edit').on('tap', function () { + if (keyValue) { + if (ReplyFlag !== 0) { + learun.layer.warning("当前投诉意见已回复！"); + return false; + } + } + $header.find('.lr-form-header-btnlist').hide(); + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + titleText = $header.find('.f-page-title').text(); + $header.find('.f-page-title').text('编辑'); + $page.find('.lr-form-container').setFormWrite(); + }); + // 更多 + $header.find('.lr-form-header-more').on('tap', function () { + learun.actionsheet({ + id: 'more', + data: [ + { + text: '删除', + mark: true, + event: function () {// 删除当前条信息 + learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在删除该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveComplaint/delete', keyValue, (data) => { + learun.layer.loading(false); + if (data) {// 删除数据成功 + learun.nav.closeCurrent(); + var prepage = learun.nav.getpage('EducationalAdministration/Sys_ReceiveComplaint'); + prepage.grid.reload(); + } + }); + } + }, '智慧校园提示', ['取消', '确定']); + } + } + ], + cancel: function () { + } + }); + }); + // 提交 + $header.find('.lr-form-header-submit').on('tap', function () { + // 获取表单数据 + if (!$page.find('.lr-form-container').lrformValid()) { + return false; + } + var _postData = {} + _postData.keyValue = keyValue; + _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveComplaint/save', _postData, (data) => { + learun.layer.loading(false); + if (data) {// 表单数据保存成功 + if (keyValue) { + learun.layer.toast('保存数据成功!'); + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是 + learun.nav.closeCurrent(); + } + var prepage = learun.nav.getpage('EducationalAdministration/Sys_ReceiveComplaint'); + prepage.grid.reload(); + } + }); + }); + page.bind($page, param); + if (keyValue) { + // 添加编辑按钮 + $page.find('.lr-form-container').setFormRead(); + $header.find('.lr-form-header-btnlist').show(); + // 获取表单数据 + learun.layer.loading(true, '获取表单数据'); + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveComplaint/form', keyValue, (data) => { + if (data) { + for (var id in data) { + if (data[id].length) { + $page.find('#' + id).lrgridSet(data[id]); + } + else { + $page.find('[data-table="' + id + '"]').lrformSet(data[id]); + } + } + } + learun.layer.loading(false); + }); + } + else { + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + } + }, + bind: function ($page, param) { + + }, destroy: function (pageinfo) { + $header = null; + keyValue = ''; + } + }; + return page; +})(); + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.html new file mode 100644 index 000000000..83056d346 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.html @@ -0,0 +1,27 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.js new file mode 100644 index 000000000..4266ab518 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/Assign.js @@ -0,0 +1,121 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：发送投诉意见 + */ +(function () { + var begin = ''; + var end = ''; + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + begin = ''; + end = ''; + multipleData = null; + page.grid = $page.find('#lr_EducationalAdministrationSys_SendComplaintAssign_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.begin = begin; + param.end = end; + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-danger')) { + //page.btnClick(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + }, + btns: page.rowBtns + }); + // 时间搜索 + $page.find('.lr_time_search').searchdate({ + callback: function (_begin, _end) { + begin = _begin; + end = _end; + multipleData = null; + page.grid.reload(); + } + }); + // 多条件查询 + var $multiple = $page.find('.lr_multiple_search').multiplequery({ + callback: function (data) { + begin = ''; + end = ''; + multipleData = data || {}; + page.grid.reload(); + } + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page, + sidx: 'SendTime desc', + sord: 'DESC' + }, + queryJson: JSON.stringify({ SendFlag: "1" }) + + }; + if (param.multipleData) { + multipleData.SendFlag = "1"; + _postParam.queryJson = JSON.stringify(multipleData); + } + if (param.begin && param.end) { + _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, SendFlag: "1" }); + } + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/pagelist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

投诉编号:

').dataFormatter({ value: _item.ComplaintCode })); + _$item.append($('

主题:

').dataFormatter({ value: _item.Title })); + _$item.append($('

投诉人:

').dataFormatter({ value: _item.CreateUserName })); + _$item.append($('

指派状态:

').dataFormatter({ value: _item.AssignFlag == 1 ? "已指派" : "未指派" })); + _$item.append($('

指派时间:

').dataFormatter({ + value: _item.AssignTime, + type: 'datetime', + dateformat: 'yyyy-MM-dd hh:mm:ss' + })); + _$item.append($('

接收人:

').dataFormatter({ value: _item.Receiver })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + learun.nav.go({ path: 'EducationalAdministration/Sys_SendComplaint/Assign/form', title: '详情', type: 'right', param: { keyValue: item.SComplaintId, AssignFlag: item.AssignFlag } }); + }, + //btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + // learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + // if (_index === '1') { + // learun.layer.loading(true, '正在删除该笔数据'); + // learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/delete', item.SComplaintId, (data) => { + // if (data) {// 删除数据成功 + // page.grid.reload(); + // } + // learun.layer.loading(false); + // }); + // } + // }, '智慧校园提示', ['取消', '确定']); + //}, + rowBtns: [] // 列表行左滑按钮 + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.html new file mode 100644 index 000000000..f1d467e3c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.html @@ -0,0 +1,22 @@ +
+
+ * + + +
+
+ * + + +
+
+ * + + +
+
+ * + +
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.js new file mode 100644 index 000000000..87e4e26a0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Assign/form/form.js @@ -0,0 +1,159 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：发送投诉意见 + */ +(function () { + var keyValue = ''; + var AssignFlag = '';//指派状态 + var $header = null; + var titleText = ''; + var page = { + isScroll: true, + init: function ($page, param) { + keyValue = param.keyValue; + AssignFlag = param.AssignFlag; + // 添加头部按钮列表 + var _html = '\ +
取消
\ +
\ +
\ +
\ +
\ +
提交
'; + $header = $page.parents('.f-page').find('.f-page-header'); + $header.append(_html); + // 取消 + $header.find('.lr-form-header-cancel').on('tap', function () { + learun.layer.confirm('确定要退出当前编辑？', function (_index) { + if (_index === '1') { + if (keyValue) {// 如果是编辑状态 + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是新增状态 关闭当前页面 + learun.nav.closeCurrent(); + } + } + }, '智慧校园提示', ['取消', '确定']); + }); + // 编辑 + $header.find('.lr-form-header-edit').on('tap', function () { + if (keyValue) { + if (AssignFlag !== 0) { + learun.layer.warning("当前投诉意见已指派！"); + return false; + } + } + $header.find('.lr-form-header-btnlist').hide(); + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + titleText = $header.find('.f-page-title').text(); + $header.find('.f-page-title').text('编辑'); + $page.find('.lr-form-container').setFormWrite(); + }); + // 更多 + $header.find('.lr-form-header-more').on('tap', function () { + learun.actionsheet({ + id: 'more', + data: [ + //{ + // text: '删除', + // mark: true, + // event: function () {// 删除当前条信息 + // learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + // if (_index === '1') { + // learun.layer.loading(true, '正在删除该笔数据'); + // learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/delete', keyValue, (data) => { + // learun.layer.loading(false); + // if (data) {// 删除数据成功 + // learun.nav.closeCurrent(); + // var prepage = learun.nav.getpage('EducationalAdministration/Sys_SendComplaint'); + // prepage.grid.reload(); + // } + // }); + // } + // }, '智慧校园提示', ['取消', '确定']); + // } + //} + ], + cancel: function () { + } + }); + }); + // 提交 + $header.find('.lr-form-header-submit').on('tap', function () { + // 获取表单数据 + if (!$page.find('.lr-form-container').lrformValid()) { + return false; + } + var formData = $page.find('.lr-form-container').lrformGet(); + formData.Receiver = $page.find("#ReceiverUserId").find("div").text(); + var _postData = {} + _postData.keyValue = keyValue; + _postData.strEntity = JSON.stringify(formData); + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/saveAssign', _postData, (data) => { + learun.layer.loading(false); + if (data) {// 表单数据保存成功 + if (keyValue) { + learun.layer.toast('保存数据成功!'); + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是 + learun.nav.closeCurrent(); + } + var prepage = learun.nav.getpage('EducationalAdministration/Sys_SendComplaint/Assign'); + prepage.grid.reload(); + } + }); + }); + page.bind($page, param); + if (keyValue) { + // 添加编辑按钮 + $page.find('.lr-form-container').setFormRead(); + $header.find('.lr-form-header-btnlist').show(); + // 获取表单数据 + learun.layer.loading(true, '获取表单数据'); + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/form', keyValue, (data) => { + if (data) { + for (var id in data) { + if (data[id].length) { + $page.find('#' + id).lrgridSet(data[id]); + } + else { + $page.find('[data-table="' + id + '"]').lrformSet(data[id]); + } + } + } + learun.layer.loading(false); + }); + } + else { + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + } + }, + bind: function ($page, param) { + $page.find('#ReceiverUserId').lrselect({ + type: 'user', + needPre: false + }); + }, destroy: function (pageinfo) { + $header = null; + keyValue = ''; + } + }; + return page; +})(); + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.html new file mode 100644 index 000000000..948db718e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.html @@ -0,0 +1,29 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+
+
+ +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.js new file mode 100644 index 000000000..e4f758a97 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaint.js @@ -0,0 +1,165 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：发送投诉意见 + */ +(function () { + var begin = ''; + var end = ''; + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + begin = ''; + end = ''; + multipleData = null; + page.grid = $page.find('#lr_EducationalAdministrationSys_SendComplaint_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.begin = begin; + param.end = end; + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-danger')) {//删除 + page.btnClick(item, $item, $page); + } + else if ($et.hasClass('lr-btn-blue')) {//提交 + page.btnClickOfSubmit(item, $item, $page); + } + else if ($et.hasClass('lr-btn-green')) {//回复情况 + page.btnClickOfReply(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + }, + btns: page.rowBtns + }); + // 时间搜索 + $page.find('.lr_time_search').searchdate({ + callback: function (_begin, _end) { + begin = _begin; + end = _end; + multipleData = null; + page.grid.reload(); + } + }); + // 多条件查询 + var $multiple = $page.find('.lr_multiple_search').multiplequery({ + callback: function (data) { + begin = ''; + end = ''; + multipleData = data || {}; + page.grid.reload(); + } + }); + $page.find('#lr_EducationalAdministrationSys_SendComplaint_btn').on('tap', function () { + learun.nav.go({ path: 'EducationalAdministration/Sys_SendComplaint/form', title: '新增', type: 'right' }); + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page, + sidx: 'SendTime desc', + sord: 'DESC' + }, + queryJson: JSON.stringify({ CreateUserId: learun.storage.get('userinfo').baseinfo.userId }) + + }; + if (param.multipleData) { + multipleData.CreateUserId = learun.storage.get('userinfo').baseinfo.userId; + _postParam.queryJson = JSON.stringify(multipleData); + } + if (param.begin && param.end) { + _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, CreateUserId: learun.storage.get('userinfo').baseinfo.userId }); + } + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/pagelist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

投诉编号:

').dataFormatter({ value: _item.ComplaintCode })); + _$item.append($('

主题:

').dataFormatter({ value: _item.Title })); + _$item.append($('

提交状态:

').dataFormatter({ value: _item.SendFlag == 1 ? "已提交" : "草稿" })); + _$item.append($('

提交时间:

').dataFormatter({ + value: _item.SendTime, + type: 'datetime', + dateformat: 'yyyy-MM-dd hh:mm:ss' + })); + _$item.append($('

回复状态:

').dataFormatter({ value: _item.ReplyFlag == 1 ? "已回复" : "未回复" })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + learun.nav.go({ path: 'EducationalAdministration/Sys_SendComplaint/form', title: '详情', type: 'right', param: { keyValue: item.SComplaintId, SendFlag: item.SendFlag } }); + }, + btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.SendFlag !== 0) { + learun.layer.warning("当前投诉意见已提交，无法删除！"); + return false; + } + learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在删除该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/delete', item.SComplaintId, (data) => { + if (data) {// 删除数据成功 + page.grid.reload(); + } + learun.layer.loading(false); + }); + } + }, '智慧校园提示', ['取消', '确定']); + }, + btnClickOfSubmit: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.SendFlag !== 0) { + learun.layer.warning("当前投诉意见已提交！"); + return false; + } + learun.layer.confirm('确定要提交该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在提交该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/submit', item.SComplaintId, (data) => { + if (data) {// 提交数据成功 + page.grid.reload(); + } + learun.layer.loading(false); + }); + } + }, '智慧校园提示', ['取消', '确定']); + }, + btnClickOfReply: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.SendFlag !== 1) { + learun.layer.warning("当前投诉意见未提交，请先提交！"); + return false; + } + if (item.ReplyFlag !== 1) { + learun.layer.warning("当前投诉意见未回复！"); + return false; + } + learun.nav.go({ path: 'EducationalAdministration/Sys_SendComplaint/reply', title: '回复情况', type: 'right', param: { keyValue: item.SComplaintId } }); + }, + rowBtns: [ + '删除', + '提交', + '回复情况' + ] // 列表行左滑按钮 + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.html new file mode 100644 index 000000000..6302b4f9b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.html @@ -0,0 +1,17 @@ +
+
+ * + + +
+
+ * + + +
+
+ * + + +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.js new file mode 100644 index 000000000..c2a2bd8b9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/form/form.js @@ -0,0 +1,169 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：发送投诉意见 + */ +(function () { + var keyValue = ''; + var SendFlag = '';//提交状态 + var $header = null; + var titleText = ''; + var page = { + isScroll: true, + init: function ($page, param) { + keyValue = param.keyValue; + SendFlag = param.SendFlag; + // 添加头部按钮列表 + var _html = '\ +
取消
\ +
\ +
\ +
\ +
\ +
提交
'; + $header = $page.parents('.f-page').find('.f-page-header'); + $header.append(_html); + // 取消 + $header.find('.lr-form-header-cancel').on('tap', function () { + learun.layer.confirm('确定要退出当前编辑？', function (_index) { + if (_index === '1') { + if (keyValue) {// 如果是编辑状态 + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是新增状态 关闭当前页面 + learun.nav.closeCurrent(); + } + } + }, '智慧校园提示', ['取消', '确定']); + }); + // 编辑 + $header.find('.lr-form-header-edit').on('tap', function () { + if (keyValue) { + if (SendFlag !== 0) { + learun.layer.warning("当前投诉意见已提交，不能编辑！"); + return false; + } + } + $header.find('.lr-form-header-btnlist').hide(); + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + titleText = $header.find('.f-page-title').text(); + $header.find('.f-page-title').text('编辑'); + $page.find('.lr-form-container').setFormWrite(); + }); + // 更多 + $header.find('.lr-form-header-more').on('tap', function () { + learun.actionsheet({ + id: 'more', + data: [ + { + text: '删除', + mark: true, + event: function () {// 删除当前条信息 + learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在删除该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/delete', keyValue, (data) => { + learun.layer.loading(false); + if (data) {// 删除数据成功 + learun.nav.closeCurrent(); + var prepage = learun.nav.getpage('EducationalAdministration/Sys_SendComplaint'); + prepage.grid.reload(); + } + }); + } + }, '智慧校园提示', ['取消', '确定']); + } + } + ], + cancel: function () { + } + }); + }); + // 提交 + $header.find('.lr-form-header-submit').on('tap', function () { + // 获取表单数据 + if (!$page.find('.lr-form-container').lrformValid()) { + return false; + } + var _postData = {} + _postData.keyValue = keyValue; + _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/save', _postData, (data) => { + learun.layer.loading(false); + if (data) {// 表单数据保存成功 + if (keyValue) { + learun.layer.toast('保存数据成功!'); + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是 + learun.nav.closeCurrent(); + } + var prepage = learun.nav.getpage('EducationalAdministration/Sys_SendComplaint'); + prepage.grid.reload(); + } + }); + }); + page.bind($page, param); + if (keyValue) { + // 添加编辑按钮 + $page.find('.lr-form-container').setFormRead(); + $header.find('.lr-form-header-btnlist').show(); + // 获取表单数据 + learun.layer.loading(true, '获取表单数据'); + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/form', keyValue, (data) => { + if (data) { + for (var id in data) { + if (data[id].length) { + $page.find('#' + id).lrgridSet(data[id]); + } + else { + $page.find('[data-table="' + id + '"]').lrformSet(data[id]); + } + } + } + learun.layer.loading(false); + }); + } + else { + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + //获取投诉编号 + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/complaintCode', "", (data) => { + if (data && data != "" && data != undefined) { + $page.find('#ComplaintCode').val(data); + } else { + $page.find('#ComplaintCode').val("TS_" + getCode()); + } + learun.layer.loading(false); + }); + } + }, + bind: function ($page, param) { + + }, destroy: function (pageinfo) { + $header = null; + keyValue = ''; + } + }; + return page; +})(); +//生成随机数 +var getCode = function () { + var a = parseInt(Math.random() * (10000 - 1000 + 1) + 1000); + var now = new Date(); + var b = now.getFullYear() + "" + ((now.getMonth() + 1) < 10 ? ("0" + (now.getMonth() + 1)) : (now.getMonth() + 1)) + "" + (now.getDate() < 10 ? ("0" + now.getDate()) : now.getDate()) + "" + (now.getHours() < 10 ? ("0" + now.getHours()) : now.getHours()) + "" + (now.getMinutes() < 10 ? ("0" + now.getMinutes()) : now.getMinutes()) + "" + (now.getSeconds() < 10 ? ("0" + now.getSeconds) : now.getSeconds()); + return b + a; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.html new file mode 100644 index 000000000..9f7849708 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.html @@ -0,0 +1,6 @@ +
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.js new file mode 100644 index 000000000..d04ab42de --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_SendComplaint/reply/reply.js @@ -0,0 +1,45 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-30 16:33 + * 描 述：发送投诉意见 + */ +(function () { + var keyValue = ''; + var $header = null; + var titleText = ''; + var page = { + isScroll: true, + init: function ($page, param) { + keyValue = param.keyValue; + page.bind($page, param); + if (keyValue) { + // 获取表单数据 + learun.layer.loading(true, '获取表单数据'); + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_SendComplaint/replylist', keyValue, (data) => { + if (data) { + var html = ''; + for (var id in data) { + for (var i = 0; i < data[id].length; i++) { + html += '
'; + html += ''; + html += ''; + html += '
'; + } + } + $page.find('#replyList').html(html); + } + learun.layer.loading(false); + }); + } + }, + bind: function ($page, param) { + + }, destroy: function (pageinfo) { + $header = null; + keyValue = ''; + } + }; + return page; +})(); + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.html index 7a7efdade..9e3982c31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.html @@ -1,7 +1,7 @@ -
+
- 总共0条 + 总共10条
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.css index 8db6708d1..e8c400520 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.css @@ -1,76 +1,75 @@ * { - box-sizing: border-box; + box-sizing: border-box; } ul { - margin: 0px; - padding: 0px; - list-style: none; + margin: 0px; + padding: 0px; + list-style: none; } li { - list-style: none; + list-style: none; } #semester2 { - margin-bottom: 10px; + margin-bottom: 10px; } #weekTime2 span { - margin: 0 10px; + margin: 0 10px; } -#weekTime2 i { -} +#weekTime2 i {} .timeTable_sec2 { - margin-bottom: 30px; - background-color: #fff; + margin-bottom: 30px; + background-color: #fff; } .noHtml { - height: 100%; - line-height: 60px; - text-align: center; - font-size: 14px; + height: 100%; + line-height: 60px; + text-align: center; + font-size: 14px; } .timeTable_sec3 { - padding: 0px 12px 1px; - text-align: center; - background: #0C86D8; - height: 35px; + padding: 0px 12px 1px; + text-align: center; + background: #0C86D8; + height: 35px; } .tSec3Time { - text-align: center; - line-height: 24px; - font-size: 14px; - color: #fff; -} - - .tSec3Time span { - display: inline-block; - background-color: #B8E2FF; - width: 6px; - height: 6px; - border-radius: 50%; - vertical-align: middle; - position: relative; - top: -2px; - margin: 0 10px; - } + text-align: center; + line-height: 24px; + font-size: 14px; + color: #fff; +} + +.tSec3Time span { + display: inline-block; + background-color: #B8E2FF; + width: 6px; + height: 6px; + border-radius: 50%; + vertical-align: middle; + position: relative; + top: -2px; + margin: 0 10px; +} .timeTable_sec4 { - padding: 0 12px; - /* margin-top: -65px; */ - margin-bottom: 10px; - background: #0075C4; + padding: 0 12px; + /* margin-top: -65px; */ + margin-bottom: 10px; + background: #0075C4; } .tSec4Box { - /* background: #fff; + /* background: #fff; padding: 20px 0; text-align: center; font-size: 0; @@ -78,12 +77,12 @@ li { } .tSec4T { - /* text-align: center; */ - margin-bottom: 10px; - overflow: hidden; - font-size: 16px; - color: #fff; - padding-top: 10px; + /* text-align: center; */ + margin-bottom: 10px; + overflow: hidden; + font-size: 16px; + color: #fff; + padding-top: 10px; } /* .tSec4T div:first-child { @@ -96,60 +95,60 @@ li { .tSec4Con { - padding-bottom: 10px; + padding-bottom: 10px; } - .tSec4Con > * { - /* display: inline-block; +.tSec4Con>* { + /* display: inline-block; vertical-align: middle; */ - } - - .tSec4Con .studSeeSec2Line { - height: 25px; - width: 1px; - background: #D6DFE2; - margin: 0 40px; - } - - .tSec4Con .studSeeSec2Txt { - color: #4FB1F3; - font-size: 14px; - } - - .tSec4Con .studSeeSec2Txt i { - margin-right: 5px; - } - - .tSec4Con .studSeeSec2Txt div { - float: right; - font-size: 20px; - margin-top: -2px; - } - - .tSec4Con .studSeeSec2Txt div span { - display: inline-block; - line-height: 20px; - font-size: 12px; - padding: 0 10px; - position: relative; - background: #4FB1F3; - color: #0075C4; - border-radius: 2px; - top: -3px; - margin-right: 5px; - } - - .tSec4Con .studSeeSec2Txt div span:after { - content: ''; - position: absolute; - border: 3px solid #4FB1F3; - border-right-color: transparent; - border-top-color: transparent; - border-bottom-color: transparent; - right: -6px; - top: 50%; - margin-top: -3px; - } +} + +.tSec4Con .studSeeSec2Line { + height: 25px; + width: 1px; + background: #D6DFE2; + margin: 0 40px; +} + +.tSec4Con .studSeeSec2Txt { + color: #4FB1F3; + font-size: 14px; +} + +.tSec4Con .studSeeSec2Txt i { + margin-right: 5px; +} + +.tSec4Con .studSeeSec2Txt div { + float: right; + font-size: 20px; + margin-top: -2px; +} + +.tSec4Con .studSeeSec2Txt div span { + display: inline-block; + line-height: 20px; + font-size: 12px; + padding: 0 10px; + position: relative; + background: #4FB1F3; + color: #0075C4; + border-radius: 2px; + top: -3px; + margin-right: 5px; +} + +.tSec4Con .studSeeSec2Txt div span:after { + content: ''; + position: absolute; + border: 3px solid #4FB1F3; + border-right-color: transparent; + border-top-color: transparent; + border-bottom-color: transparent; + right: -6px; + top: 50%; + margin-top: -3px; +} /* .tSec4Con .studSeeSec2Txt div:first-child span { font-size: 20px; @@ -162,39 +161,39 @@ li { } */ .timeTableList { - overflow: hidden; - padding: 3px 7px 18px; -} - - .timeTableList li { - width: 33.333333%; - float: left; - font-size: 14px; - line-height: 16px; - margin-top: 14px; - padding: 0 7px; - } - - .timeTableList div { - border: 1px solid #DAEFFD; - padding: 13px 0; - text-align: center; - overflow: hidden; - } - - .timeTableList span { - color: #fff; - font-size: 12px; - border: 1px solid #cacaca; - border-radius: 50%; - height: 14px; - width: 14px; - line-height: 12px; - /* margin-right: 5px; */ - position: relative; - top: -1px; - margin-left: 6px; - } + overflow: hidden; + padding: 3px 7px 18px; +} + +.timeTableList li { + width: 33.333333%; + float: left; + font-size: 14px; + line-height: 16px; + margin-top: 14px; + padding: 0 7px; +} + +.timeTableList div { + border: 1px solid #DAEFFD; + padding: 13px 0; + text-align: center; + overflow: hidden; +} + +.timeTableList span { + color: #fff; + font-size: 12px; + border: 1px solid #cacaca; + border-radius: 50%; + height: 14px; + width: 14px; + line-height: 12px; + /* margin-right: 5px; */ + position: relative; + top: -1px; + margin-left: 6px; +} /* .timeTableList li.active span { color: #9D9E9E !important; @@ -202,176 +201,177 @@ li { border-color: #cacaca !important; } */ -.timeTableBtn,.submitBtn { - font-size: 16px; - margin: 20px 12px; - background: #0C86D8; - border-radius: 4px; - text-align: center; - line-height: 40px; - height: 40px; - color: #fff; - cursor:pointer; +.timeTableBtn, +.submitBtn { + font-size: 16px; + margin: 20px 12px; + background: #0C86D8; + border-radius: 4px; + text-align: center; + line-height: 40px; + height: 40px; + color: #fff; + cursor: pointer; } .statusType { - padding: 10px 12px; - background: #fff; - overflow: hidden; - margin-bottom: 10px; -} - - .statusType li { - width: 16.666667%; - float: left; - /* text-align: center; */ - font-size: 14px; - line-height: 16px; - } - - .statusType span { - display: inline-block; - color: #fff; - line-height: 14px; - font-size: 12px; - border: 1px solid #cacaca; - border-radius: 50%; - height: 9px; - width: 9px; - line-height: 12px; - margin-right: 5px; - position: relative; - top: 0px; - } + padding: 10px 12px; + background: #fff; + overflow: hidden; + margin-bottom: 10px; +} + +.statusType li { + width: 16.666667%; + float: left; + /* text-align: center; */ + font-size: 14px; + line-height: 16px; +} + +.statusType span { + display: inline-block; + color: #fff; + line-height: 14px; + font-size: 12px; + border: 1px solid #cacaca; + border-radius: 50%; + height: 9px; + width: 9px; + line-height: 12px; + margin-right: 5px; + position: relative; + top: 0px; +} /*未检测*/ .sStatue1 span { - background: #0089FE; - color: #0089FE; - border-color: #0089FE; + background: #0089FE; + color: #0089FE; + border-color: #0089FE; } /*正常*/ .sStatue2 span { - background: #F2B60A; - color: #F2B60A; - border-color: #F2B60A; + background: #F2B60A; + color: #F2B60A; + border-color: #F2B60A; } /*异常*/ .sStatue3 span { - background: #E24545; - color: #E24545; - border-color: #E24545; + background: #E24545; + color: #E24545; + border-color: #E24545; } /*病假*/ .sStatue4 span { - background: #29CF41; - color: #29CF41; - border-color: #29CF41; + background: #29CF41; + color: #29CF41; + border-color: #29CF41; } /*迟到*/ .sStatue5 span { - background: #ad5151; - color: #ad5151; - border-color: #ad5151; + background: #ad5151; + color: #ad5151; + border-color: #ad5151; } /*事假*/ .sStatue6 span { - background: #84f193; - color: #84f193; - border-color: #84f193; + background: #84f193; + color: #84f193; + border-color: #84f193; } .timeTableAlertZ { - width: 100%; - height: 100%; - z-index: 99; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, .5); - display: none; + width: 100%; + height: 100%; + z-index: 99; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, .5); + display: none; } .timeTableAlert { - z-index: -1; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: auto; - width: 80%; - height: 70%; - background: #fff; - border-radius: 4px; - filter: alpha(opacity=0); - -moz-opacity: 0; - -khtml-opacity: 0; - opacity: 0; - transition: all 0.3s; - -moz-transition: all 0.3s; - -ms-transition: all 0.3s; - -o-transition: all 0.3s; - -webkit-transition: all 0.3s; - overflow: hidden; -} - - .timeTableAlert.active { - z-index: 999; - filter: alpha(opacity=100); - -moz-opacity: 1; - -khtml-opacity: 1; - opacity: 1; - } + z-index: -1; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + width: 80%; + height: 70%; + background: #fff; + border-radius: 4px; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + overflow: hidden; +} + +.timeTableAlert.active { + z-index: 999; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; +} .timeTableAlertTop { - background-color: #0C86D8; - padding: 10px 12px; + background-color: #0C86D8; + padding: 10px 12px; } .timeTableAlertT { - color: #fff; - font-size: 16px; + color: #fff; + font-size: 16px; } .timeTableAlertTxt { - font-size: 14px; - color: #B8E2FF; - text-align: right; - margin-top: 5px; + font-size: 14px; + color: #B8E2FF; + text-align: right; + margin-top: 5px; } .timeTableAlertList { - overflow: auto; - max-height: calc(100% - 62px); + overflow: auto; + max-height: calc(100% - 62px); } - .timeTableAlertList li { - line-height: 40px; - text-align: center; - font-size: 14px; - color: #1A1A1A; - } +.timeTableAlertList li { + line-height: 40px; + text-align: center; + font-size: 14px; + color: #1A1A1A; +} - .timeTableAlertList li.active { - background-color: #D1ECFF !important; - } +.timeTableAlertList li.active { + background-color: #D1ECFF !important; +} - .timeTableAlertList li:nth-child(2n) { - background-color: #FBFDFF; - } +.timeTableAlertList li:nth-child(2n) { + background-color: #FBFDFF; +} - .timeTableAlertList li:nth-child(2n - 1) { - background-color: #FFFFFF; - } +.timeTableAlertList li:nth-child(2n - 1) { + background-color: #FFFFFF; +} #MeasureTime { - text-align: center; + text-align: center; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js index 56d3741ca..3abfad53a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js @@ -4,6 +4,7 @@ isScroll: false, init: function ($page, param) { //console.log(param) 传过来的参数 在param上 + //console.log(param) //测温时间段 $page.find('#MeasureTime').lrpickerex({ code: 'MeasureTime', @@ -52,41 +53,6 @@ $('.timeTableAlert').removeClass('active'); } - //弹框确定按钮：单个学生提交测温 - //$page.find(".timeTableBtn").on('tap', - // function () { - // // 获取表单数据 - // if (!$page.find('.lr-form-container').lrformValid()) { - // return false; - // } - // var data = JSON.parse($(this).siblings('.timeTableAlertTop').attr('student')); - // data.Status = $page.find('#Status').lrpickerGet(); - // data.Temperature = $page.find('#Temperature').val(); - // data.ProcessingResult = $page.find('#ProcessingResult').val(); - // data.Remark = $page.find('#Remark').val(); - // data.MeasureTime = $page.find('#MeasureTime').lrpickerGet(); - // learun.layer.confirm('是否确认提交测温？', - // function (_index) { - // if (_index === '1') { - // learun.layer.loading(true, '正在提交'); - // learun.httppost( - // config.webapi + '/learun/adms/EducationalAdministration/Thermography/save', - // { - // keyValue: data.ID, - // strEntity: JSON.stringify(data) - // }, - // (data) => { - // learun.layer.loading(false); - // if (data) { - // learun.layer.toast("提交成功"); - // timeTableAlertFn(); - // loadData($page, param); - // } - // }); - // } - // }); - // }); - //弹框确定按钮：弹框数据绑定到学生列表上 $page.find(".timeTableBtn").on('tap', function () { @@ -95,11 +61,13 @@ return false; } var data = JSON.parse($(this).siblings('.timeTableAlertTop').attr('student')); + data.Status = $page.find('#Status').lrpickerGet(); data.Temperature = $page.find('#Temperature').val(); data.ProcessingResult = $page.find('#ProcessingResult').val(); data.Remark = $page.find('#Remark').val(); data.MeasureTime = $page.find('#MeasureTime').lrpickerGet(); + $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').attr('student', JSON.stringify(data)); var classTemp = !data.Status ? 'sStatue1' : data.Status == "0" ? 'sStatue1' : data.Status == "1" ? 'sStatue2' : 'sStatue3'; $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').removeClass().addClass(classTemp); @@ -139,6 +107,7 @@ }; function loadData($page, param) { + console.log($page.find('#MeasureTime').lrpickerGet()) var _postParam = { queryJson: JSON.stringify({ MeasurerID: learun.storage.get('userinfo').baseinfo.account, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js index 0b8e53ed1..f42b98b6a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2020-02-03 14:37 @@ -18,6 +18,7 @@ lclass: page.lclass, rows: 10, // 每页行数 getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + console.log(param) param.multipleData = multipleData; page.loadData(param, callback, $page); }, @@ -37,6 +38,8 @@ // 多条件查询 var $multiple = $page.find('.lr_multiple_search').multiplequery({ callback: function (data) { + console.log(11) + console.log(data) begin = ''; end = ''; multipleData = data || {}; @@ -63,14 +66,20 @@ queryJson: '{}' }; var userInfo = learun.storage.get('userinfo'); + //console.log(param) + var aaa=''; if (param.multipleData) { + multipleData.Creater = userInfo.baseinfo.userId; _postParam.queryJson = JSON.stringify(multipleData); - } - if (param.begin && param.end) { - _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end }); - } + }else{ + _postParam.queryJson=JSON.stringify({Creater:userInfo.baseinfo.userId}) + } + // if (param.begin && param.end) { + // _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end,Creater:userInfo.baseinfo.userId }); + // } _postParam.queryJson=JSON.stringify({Creater:userInfo.baseinfo.userId}) learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/pagelist', _postParam, (data) => { + // console.log(data) $page.find('.lr-badge').text('0'); if (data) { $page.find('.lr-badge').text(data.records); @@ -90,55 +99,13 @@ keyId:'f_userid', text:'f_realname' })); - //_$item.append($('

单位名称:

').dataFormatter({ value: _item.UnitName })); - //_$item.append($('

返工人员:

').dataFormatter({ value: _item.BackUser })); - //_$item.append($('

类别:

').dataFormatter({ value: _item.Type, - // type: 'dataItem', - // code: 'EUserType' - //})); - //_$item.append($('

所在部门:

').dataFormatter({ value: _item.Department })); - //_$item.append($('

关系:

').dataFormatter({ value: _item.RelationShip, - // type: 'dataItem', - // code: 'ERelationship' - //})); - //_$item.append($('

性别:

').dataFormatter({ - // value: _item.Gender, - // type: 'dataItem', - // code: 'usersex' - //})); - _$item.append($('

填报时间:

').dataFormatter({ value: _item.CreateTime, + + _$item.append($('

填报时间:

').dataFormatter({ + value: _item.CreateTime, type: 'datetime', dateformat: 'yyyy-MM-dd' })); - //_$item.append($('

身份证号:

').dataFormatter({ value: _item.IDCard })); - //_$item.append($('

家庭住址:

').dataFormatter({ value: _item.HomeAddress })); - //_$item.append($('

联系方式:

').dataFormatter({ value: _item.Mobile })); - //_$item.append($('

前往省份:

').dataFormatter({ value: _item.Provice, - // type: 'dataSource', - // code: 'DIC_PROVINCE', - // keyId: 'pcode', - // text: 'pname' - //})); - //_$item.append($('

前往详细地址:

').dataFormatter({ value: _item.Objective })); - //_$item.append($('

外出原因:

').dataFormatter({ - // value: _item.OutReason, - // type: 'dataItem', - // code: 'OutReason' - //})); - //_$item.append($('

外出时间:

').dataFormatter({ value: _item.OutTime, - // type: 'datetime', - // dateformat: 'yyyy-MM-dd' - //})); - //_$item.append($('

返回时间:

').dataFormatter({ value: _item.BackHomeTime, - // type: 'datetime', - // dateformat: 'yyyy-MM-dd' - //})); - //_$item.append($('

交通工具:

').dataFormatter({ value: _item.Vehicle, - // type: 'dataItem', - // code: 'Vehicle' - //})); - //_$item.append($('

交通工具号码:

').dataFormatter({ value: _item.VehicleNum })); - //_$item.append($('

返回抵达目的地:

').dataFormatter({ value: _item.BackAddress })); + return ''; }, rowClick: function (item, $item, $page) {// 列表行点击触发方法 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html index 3cef3e612..f7d364eaf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html @@ -1,4 +1,4 @@ -
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js index 25ed7d764..c39d207c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2020-02-03 14:37 @@ -12,6 +12,7 @@ isScroll: true, init: function ($page, param) { keyValue = param.keyValue; + // console.log(param) // 添加头部按钮列表 var _html = '\
取消
\ @@ -80,6 +81,7 @@ }); }); // 提交 + $header.find('.lr-form-header-submit').on('tap', function () { // 获取表单数据 if (!$page.find('.lr-form-container').lrformValid()) { @@ -87,9 +89,10 @@ } var _postData = {} _postData.keyValue = keyValue; - var pageForm = $page.find('[data-table="EpidemicSituation"]').lrformGet(); var allArea = $page.find('#ProvinceArea').lrpickerGet(); + console.log($page.find('#ProvinceArea')) + console.log(allArea) if (allArea) { var list = allArea.split(','); @@ -97,7 +100,7 @@ pageForm.OutArea = list[1] || ''; pageForm.City = list[2] || ''; } - + console.log(pageForm) _postData.strEntity = JSON.stringify(pageForm); if ($page.find('#HasFamily').lrpickerGet() == '1') { @@ -146,6 +149,8 @@ _postData.strpeopleDetailsList = '[]'; } + console.log(_postData) + return learun.layer.loading(true, '正在提交数据'); learun.httppost(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/save', _postData, (data) => { learun.layer.loading(false); @@ -174,6 +179,8 @@ $header.find('.lr-form-header-btnlist').show(); // 获取表单数据 learun.layer.loading(true, '获取表单数据'); + // console.log(11) + // console.log(keyValue) learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/form', keyValue, (data) => { if (data) { //省市区数据处理 @@ -194,8 +201,6 @@ $page.find('[data-table="' + id + '"]').lrformSet(data[id]); } } - - } learun.layer.loading(false); }); @@ -322,6 +327,7 @@ //新建时获取登陆人信息 var userInfo = learun.storage.get('userinfo'); + //console.log(userInfo) if (!keyValue) { @@ -340,6 +346,7 @@ learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/getStuSource', userInfo.baseinfo.account, (data) => { + console.log(data) if (data) { $page.find('#HomeAddress').val(data.Address); $page.find('#StudentSource').val(data.res); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/attendance/attendance.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/attendance/attendance.js index 6a5417282..a5d013944 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/attendance/attendance.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/attendance/attendance.js @@ -630,7 +630,7 @@ } function ajaxData(jqs) { - var html = '
2019年3月11日 星期三
'; + var html = '
'+ jqs.day +'
'; $.each(jqs.list, function (i, n) { var times = '', timeTxt = '', attendConStatus = ''; if (i == 0) { @@ -663,7 +663,7 @@ dataK = data; } - ); + ); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/examArrangement/examArrangement.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/examArrangement/examArrangement.js index cdc7a5fd2..8ebb507fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/examArrangement/examArrangement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/examArrangement/examArrangement.js @@ -99,8 +99,7 @@ var weekData2 = ProcessingData(weekData); var tSec2List = $('.tSec2List'); weekTimeSpan.eq(0).text(todayWeek.Monday).end().eq(1).text(todayWeek.Sunday); - $.each(weekData2, - function (i, n) { + $.each(weekData2,function (i, n) { var html = ''; n.lessonData.sort(compare('sectionTime')); if (n.lessonData.length == 0) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/myAttendance.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/myAttendance.js index 2976d2efd..7fdc44b81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/myAttendance.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/myAttendance.js @@ -67,8 +67,7 @@ if (n.lessonData.length == 0) { html += '
  • 该时间段没有课程
    • '; } else { - $.each(n.lessonData, - function (j, k) { + $.each(n.lessonData,function (j, k) { var lessonInfo = JSON.stringify(k); console.log(lessonInfo); html += '
  • ' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/studentAtten/studentAtten.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/studentAtten/studentAtten.js index d0bc269c5..751601e20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/studentAtten/studentAtten.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/studentAtten/studentAtten.js @@ -5,7 +5,7 @@ var page = { isScroll: false, init: function ($page, param) { - + console.log(param) loadData(param); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html index 0299d65aa..38b631535 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html @@ -174,53 +174,6 @@ 按照公安部有关规定，户口迁移遵循自愿原则。
    • - -
    西昌民族幼儿师范高等专科学校
    二0一九年九月一日
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js index c989d93cd..0ce0972cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js @@ -18,9 +18,11 @@ $('#ClassNo').html(entity.ClassNo); $('#ClassTutorName').html(entity.ClassTutorName); $('#ClassTutorMobile').html(entity.ClassTutorMobile); + $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费"); $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交"); $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取"); + $('#IsCompleteInfo').html(entity.IsCompleteInfo); $('#Dormitory').html(entity.DormitoryName); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js index ec11bc7c0..c402b0780 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js @@ -19,21 +19,25 @@ } else { notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png"); } + if (data["StuInfoFreshEntity"].PayFeeStatus == "1") { completeStyle("#PayFeeStatus", "images/enter1-2.png"); } else { notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); } + if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") { completeStyle("#StudentLoan", "images/enter1-3.png"); } else { notCompleteStyle("#StudentLoan", "images/enter2-3.png"); } + if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); } else { notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); } + if (data["StuInfoFreshEntity"].RegisterStatus == "1") { completeStyle("#RegisterStatus", "images/enter1-5.png"); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/stuExamArrangement/stuExamArrangement.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/stuExamArrangement/stuExamArrangement.js index 639415bd5..d2a63f409 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/stuExamArrangement/stuExamArrangement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/stuExamArrangement/stuExamArrangement.js @@ -95,19 +95,21 @@ judgeDate(todayWeek.SundayTime); var param = { startTime: start, endTime: end }; learun.httpget(config.webapi + "arrangeExam/stuList", param, (data) => { + //console.log(data) weekData = data; var weekData2 = ProcessingData(weekData); var tSec2List = $('.tSec2List'); weekTimeSpan.eq(0).text(todayWeek.Monday).end().eq(1).text(todayWeek.Sunday); - $.each(weekData2, - function (i, n) { + //console.log(weekData2) + $.each(weekData2, function (i, n) { + // console.log(n) var html = ''; n.lessonData.sort(compare('sectionTime')); + if (n.lessonData.length == 0) { html += '
  • 该时间段没有考试
    • '; } else { - $.each(n.lessonData, - function (j, k) { + $.each(n.lessonData, function (j, k) { html += '
  • ' + '
    第' + k.sectionTime + @@ -132,7 +134,8 @@ } tSec2List.eq(n.weekTime - 1).html(html); }); - } + + } ); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentAttendance/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentAttendance/form/form.js index 52147149e..39e876d5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentAttendance/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentAttendance/form/form.js @@ -5,7 +5,6 @@ init: function ($page, param) { //console.log(param) 传过来的参数 在param上 //初始化 - console.log(param); loadData(param); $('.tSec3Time').html('' + param.LessonDate + ' 第' + param.LessonTime.substring(1) + '节'); $('.tSec4T').html('
    ' + @@ -18,7 +17,6 @@ function () { var that = $(this); var jsons = JSON.parse(that.attr('student')); - // console.log(jsons) var type = that.attr('class'); type = type.length == 0 ? 'sStatue1' : type; that.addClass('active'); @@ -48,20 +46,19 @@ $(".timeTableList li").each(function () { var keType = $(this).attr("kqtype") ? $(this).attr("kqtype") : "0"; + console.log(keType); var object = JSON.parse($(this).attr("student")); object.kqType = keType; - rowData.push(object); }) var jsonObj = JSON.parse(JSON.stringify(rowData)); - console.log(JSON.stringify(jsonObj)); learun.layer.confirm('是否确认提交考勤？', function (num) { learun.layer.loading(true, '正在提交'); learun.httppost( - config.webapi + '/Learun/EducationalAdministration/StuAttendanceLeave/apply', + config.webapi + '/Learun/adms/EducationalAdministration/StuAttendanceLeave/apply', { lessonTime: param.LessonTime, lessonDate: param.LessonDate, @@ -103,7 +100,6 @@ ) }; learun.httpget(config.webapi + "/teachattendance/students", _postParam, (data) => { - console.log(data); studentCheckData(data, param) }) } @@ -115,7 +111,9 @@ } else { $.each(weekData2.rows, function (j, k) { var statusName = !k.Sort ? 'sStatue1' : k.Sort == "准时" ? 'sStatue1' : k.Sort == "早退" ? 'sStatue2' : k.Sort == "旷课" ? 'sStatue3' : k.Sort == "病假" ? 'sStatue4' : k.Sort == "迟到" ? 'sStatue5' : 'sStatue6'; - html += '
  • ' + + var sktype = !k.Sort ? '0' : k.Sort == "准时" ? '0' : k.Sort == "早退" ? '2' : k.Sort == "旷课" ? '5' : k.Sort == "病假" ? '3' : k.Sort == "迟到" ? '1' : '4'; + k.kqType=sktype; + html += '
  • ' + k.StuName + '' + '
    • '; }) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js index 9815c243c..3766ea43a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js @@ -85,7 +85,8 @@ }; function studentCheckData(Monday, Sunday) { var studCheckList = $('.studCheckList'); - learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", {}, (data) => { + var param = { StartDate: Monday, EndDate: Sunday }; + learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", param, (data) => { console.log(data); $.each(data, function (i, n) { var html = ''; @@ -131,8 +132,6 @@ } studCheckList.eq(parseInt(n.week) - 1).html(html) }) - - }) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js index 8d9290718..926dde13c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js @@ -25,6 +25,7 @@ //获取学年学期列表 learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "scoreSearch/academicAndSemesterList", {}, (data) => { + console.log(data) if (data == null || data.length <= 0) { $('.studSeeSec2 .studSeeSec2Top').hide(); $('.studSeeSec2 .tips').show(); @@ -52,6 +53,7 @@ function studentSeeAjax(id) { var param = { value: id }; learun.httpget(config.webapi + "scoreSearch/scoreList", param, (data) => { + console.log(data) if(data != null){ var html1 = '
    ' + '
    ' + data.Rank + '名
    班级排名
    ' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html index 297d56e08..6c1605ae5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html @@ -1,4 +1,4 @@ -
    +
    -
    \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js index f25753c3b..0b2c303d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js @@ -1,4 +1,4 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2018 北京泉江科技有限公司 * 创建人：超级管理员 * 日 期：2019-06-24 14:40 @@ -50,35 +50,7 @@ $header.find('.f-page-title').text('请假'); $page.find('.lr-form-container').setFormWrite(); }); - //// 更多 - //$header.find('.lr-form-header-more').on('tap', function () { - // learun.actionsheet({ - // id: 'more', - // data: [ - // { - // text: '删除', - // mark: true, - // event: function () {// 删除当前条信息 - // learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { - // if (_index === '1') { - // learun.layer.loading(true, '正在删除该笔数据'); - // learun.httppost(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/delete', keyValue, (data) => { - // learun.layer.loading(false); - // if (data) {// 删除数据成功 - // learun.nav.closeCurrent(); - // var prepage = learun.nav.getpage('EducationalAdministration/StuAttendanceLeave'); - // prepage.grid.reload(); - // } - // }); - // } - // }, '智慧校园提示', ['取消', '确定']); - // } - // } - // ], - // cancel: function () { - // } - // }); - //}); + // 提交 $header.find('.lr-form-header-submit').on('tap', function () { // 获取表单数据 @@ -88,6 +60,9 @@ var _postData = {} _postData.keyValue = keyValue; _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + console.log($page.find('.lr-form-container').lrformGet()) + console.log(_postData) + return learun.layer.loading(true, '正在提交数据'); learun.httppost(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/save', _postData, (data) => { learun.layer.loading(false); @@ -115,10 +90,9 @@ $header.find('.lr-form-header-btnlist').show(); // 获取表单数据 learun.layer.loading(true, '获取表单数据'); - learun.httpget(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/leaveform', keyValue, (data) => { + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuAttendanceLeave/leaveform', {}, (data) => { console.log(data); if (data) { - for (var id in data) { if (data[id]) { if (data[id].length) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js index 43d791fa2..bcf748367 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js @@ -94,6 +94,7 @@ function loadData(start, end) { judgeDate(todayWeek.SundayTime); var param = { StartDate: start, EndDate: end }; + // let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' }; learun.httpget(config.webapi + "learun/adms/timetable/list", param, (data) => { weekData = data; var weekData2 = ProcessingData(weekData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js index 843db5afa..e4a8ae29f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js @@ -216,6 +216,8 @@ StuInfoFreshFamilyEntities: family(), StuInfoFreshEmergePeopleEntities: emergePeople() }; + console.log(postdata) + // return learun.layer.loading(true, '正在提交数据'); learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => { learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js index 7cfcdc90b..341111d94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js @@ -1,4 +1,4 @@ -/* +/* * 版 本 Learun-ADMS V7.0.0 数字化智慧校园(http://www.learun.cn) * Copyright (c) 2013-2017 北京泉江科技有限公司 * 创建人：数字化智慧校园-前端开发组 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs index 5aba87495..07dc70fe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs @@ -172,6 +172,9 @@ namespace Learun.Application.Organization /// [Column("F_ORDER")] public int? F_Order { get; set; } + + [Column("F_ISVIRTUALIZATION")] + public bool? F_IsVirtualization { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs index d86188c5b..6b899a69a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs @@ -668,6 +668,7 @@ namespace Learun.Application.Organization companyId = item.F_CompanyId, departmentId = item.F_DepartmentId, name = item.F_RealName, + mobile=item?.F_Mobile }; string img = ""; if (!string.IsNullOrEmpty(item.F_HeadIcon)) @@ -857,7 +858,7 @@ namespace Learun.Application.Organization /// 重置密码 /// /// 账号主键 - public void ResetPassword(string keyValue) + public void ResetPassword(string keyValue, string defaultpwd) { try { @@ -871,7 +872,7 @@ namespace Learun.Application.Organization { cache.Remove(cacheKeyId + item, CacheId.user); } - string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["defaultpwd"], 32).ToLower(); + string password = Md5Helper.Encrypt(defaultpwd, 32).ToLower(); userService.RevisePasswordBatch(keyValue, password); } catch (Exception ex) @@ -908,7 +909,7 @@ namespace Learun.Application.Organization /// 重置密码(八位) /// /// 账号主键 - public void ResetPasswordEight(string keyValue) + public void ResetPasswordEight(string keyValue, string defaultpwd) { try { @@ -916,7 +917,7 @@ namespace Learun.Application.Organization { cache.Remove(cacheKeyId + item, CacheId.user); } - string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["defaultpwdeight"], 32).ToLower(); + string password = Md5Helper.Encrypt(defaultpwd, 32).ToLower(); userService.RevisePasswordBatch(keyValue, password); } catch (Exception ex) @@ -1201,6 +1202,31 @@ namespace Learun.Application.Organization } } + + /// + /// 修改用户的允许登录结束时间 + /// + /// 主键值 + /// 状态：1-赋值；0-重置 + public void UpdateAllowEndTime(string keyValue, int state) + { + try + { + userService.UpdateAllowEndTime(keyValue, state); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + ///// ///// 获取用户头像 ///// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs index d3638ade7..fe666353f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs @@ -130,12 +130,12 @@ namespace Learun.Application.Organization /// 重置密码 /// /// 账号主键 - void ResetPassword(string keyValue); + void ResetPassword(string keyValue, string defaultpwd); /// /// 重置密码(八位) /// /// 账号主键 - void ResetPasswordEight(string keyValue); + void ResetPasswordEight(string keyValue, string defaultpwd); /// /// 修改用户状态 /// @@ -179,7 +179,7 @@ namespace Learun.Application.Organization /// 用户ID void GetImg(string userId); - void setPassword(string userid,string pwd); + void setPassword(string userid, string pwd); List GetStudents(); #endregion @@ -195,5 +195,12 @@ namespace Learun.Application.Organization void UpdateIp(string ip, string id); void GetImgForDC(string userId); UserEntity GetEntityByWeixinOpenIdPC(string openId); + + /// + /// 修改用户的允许登录结束时间 + /// + /// 主键值 + /// 状态：1-赋值；0-重置 + void UpdateAllowEndTime(string keyValue, int state); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserModel.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserModel.cs index 911e39c91..c2bc11344 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserModel.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserModel.cs @@ -26,5 +26,6 @@ /// public string img { get; set; } public string id { get; set; } + public string mobile { get; set; } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs index c3bd4ab11..fd8eeb15c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs @@ -128,7 +128,7 @@ namespace Learun.Application.Organization { try { - return this.BaseRepository().FindList(a => a.F_Description == "教师").ToList().Count() > 0 ? true : false; + return this.BaseRepository().FindList(a =>a.F_Description == "教师"&&a.F_DeleteMark==1&&a.F_EnabledMark==1).ToList().Count() > 0 ? true : false; } catch (Exception ex) { @@ -848,6 +848,38 @@ namespace Learun.Application.Organization } } } + + /// + /// 修改用户的允许登录结束时间 + /// + /// 主键值 + /// 状态：1-赋值；0-重置 + public void UpdateAllowEndTime(string keyValue, int state) + { + try + { + if (state == 0) + { + this.BaseRepository().ExecuteBySql("update LR_Base_User set F_AllowEndTime=null where F_UserId='" + keyValue + "'"); + } + else + { + this.BaseRepository().ExecuteBySql("update LR_Base_User set F_AllowEndTime='" + DateTime.Now + "' where F_UserId='" + keyValue + "'"); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainOfTeacherController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainOfTeacherController.cs new file mode 100644 index 000000000..f6918a368 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainOfTeacherController.cs @@ -0,0 +1,247 @@ +using System; +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.Ask; +using System.Web.Mvc; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.EducationalAdministration; + +namespace Learun.Application.Web.Areas.Ask.Controllers +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2019-04-23 15:50 + /// 描 述：教师问卷管理 + /// + public class Ask_MainOfTeacherController : MvcControllerBase + { + private Ask_MainOfTeacherIBLL ask_MainOfTeacherIBLL = new Ask_MainOfTeacherBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + + [HttpGet] + public ActionResult AnswerIndex() + { + return View(); + } + + [HttpGet] + public ActionResult TeacherIndex() + { + var logininfo = LoginUserInfo.Get(); + ViewBag.EmpNo = logininfo.account; + ViewBag.EmpName = logininfo.realName; + return View(); + } + [HttpGet] + public ActionResult AnswerQuery() + { + return View(); + } + + [HttpGet] + public ActionResult Paper(string VID) + { + ViewBag.EmpNo = LoginUserInfo.Get().account; + ViewBag.EmpName = LoginUserInfo.Get().realName; + if (!string.IsNullOrEmpty(VID)) + { + var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestions(VID); + return View(Ask_MainOfTeacher); + } + else + { + return View(); + } + } + [HttpGet] + public ActionResult PaperAdminView(string VID) + { + ViewBag.EmpNo = LoginUserInfo.Get().account; + ViewBag.EmpName = LoginUserInfo.Get().realName; + if (!string.IsNullOrEmpty(VID)) + { + var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestions(VID); + return View(Ask_MainOfTeacher); + } + else + { + return View(); + } + } + [HttpGet] + public ActionResult PaperView(string VID,string EmpNo) + { + if (!string.IsNullOrEmpty(VID)) + { + var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestionsResult(VID, EmpNo); + return View(Ask_MainOfTeacher); + } + else + { + return View(); + } + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + ViewBag.VSerial = "Table_" + CommonHelper.CreateNo(); + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = ask_MainOfTeacherIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + + [HttpGet] + [AjaxOnly] + public ActionResult GetTeacherPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = ask_MainOfTeacherIBLL.GetTeacherPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + + [HttpGet] + [AjaxOnly] + public ActionResult GetAnswerPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = ask_MainOfTeacherIBLL.GetTeacherPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Ask_MainOfTeacherData = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntity(keyValue); + var jsonData = new + { + Ask_MainOfTeacher = Ask_MainOfTeacherData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + ask_MainOfTeacherIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + + [HttpPost] + [AjaxOnly] + public ActionResult SubmitForm(string keyValue) + { + ask_MainOfTeacherIBLL.ChangeFormStatus(keyValue, true); + return Success("操作成功！"); + } + + [HttpPost] + [AjaxOnly] + public ActionResult UnSubmitForm(string keyValue) + { + ask_MainOfTeacherIBLL.ChangeFormStatus(keyValue, false); + return Success("操作成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + var userinfo = LoginUserInfo.Get(); + Ask_MainOfTeacherEntity entity = strEntity.ToObject(); + entity.UID = userinfo.userId; + entity.UName = userinfo.realName; + entity.VCreateTime = DateTime.Now; + entity.Status = false; + entity.SPVNum = 0; + entity.SPNum = 0; + entity.SClick = 0; + ask_MainOfTeacherIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + [ValidateInput(false)] + public ActionResult TeacherSubmitForm(string answerlist,string VID) + { + var userinfo = LoginUserInfo.Get(); + List entity = answerlist.ToObject>(); + ask_MainOfTeacherIBLL.SaveAsk_QuestionResultEntity(entity, VID,userinfo.account,userinfo.realName, userinfo.iPAddress); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_QuestionItemsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_QuestionItemsController.cs index 0d49ec620..7e119aab3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_QuestionItemsController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_QuestionItemsController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.Ask; using System.Web.Mvc; using System.Collections.Generic; +using System.Linq; namespace Learun.Application.Web.Areas.Ask.Controllers { @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +36,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } #endregion @@ -66,7 +67,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers [AjaxOnly] public ActionResult GetAnalysisList(string queryJson) { - var data = ask_QuestionItemsIBLL.GetAnalysisList(queryJson); + var data = ask_QuestionItemsIBLL.GetAnalysisList(queryJson).OrderBy(x => x.IOrder); return Success(data); } /// @@ -77,8 +78,9 @@ namespace Learun.Application.Web.Areas.Ask.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Ask_QuestionItemsData = ask_QuestionItemsIBLL.GetAsk_QuestionItemsEntity( keyValue ); - var jsonData = new { + var Ask_QuestionItemsData = ask_QuestionItemsIBLL.GetAsk_QuestionItemsEntity(keyValue); + var jsonData = new + { Ask_QuestionItems = Ask_QuestionItemsData, }; return Success(jsonData); @@ -110,7 +112,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Ask_QuestionItemsEntity entity = strEntity.ToObject(); - ask_QuestionItemsIBLL.SaveEntity(keyValue,entity); + ask_QuestionItemsIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.cshtml new file mode 100644 index 000000000..f6f195120 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.cshtml @@ -0,0 +1,38 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    姓名
    + +
    +
    +
    编号
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  查看答卷 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js new file mode 100644 index 000000000..3755394dd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js @@ -0,0 +1,88 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var VID = request("VID"); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 答题情况 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + var EmpNo = $('#gridtable').jfGridValue('EmpNo'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('IsAnswer'); + if (Status === false || Status === 'false') { + learun.alert.warning("当前项目未交卷！"); + return; + } + learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperView?VID=' + keyValue + '&EmpNo=' + EmpNo }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetAnswerPageList', + headData: [ + { label: "姓名", name: "EmpName", width: 80, align: "left" }, + { label: "编号", name: "EmpNo", width: 80, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue.toLowerCase() === true || cellvalue.toLowerCase() == "true" ? "男" : "女"; + } + }, + { + label: "考核部门", name: "DepartmentId", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "是否交卷", name: "IsAnswer", width: 80, align: "left", formatter: function (cellvalue) { + return cellvalue === true ? "" : ""; + } + }, + { label: "得分", name: "TotalScore", width: 80, align: "left" } + ], + mainId: 'EmpNo', + isPage: true, + sidx: 'TotalScore', + sord: 'DESC' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.VID = VID; + param.Manager = true; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.cshtml new file mode 100644 index 000000000..bd4360dd0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.cshtml @@ -0,0 +1,46 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    标题
    + +
    +
    +
    问卷编号
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  录入 +  修改 +  删除 +  管理问题 +  答题情况 +
    +
    +   审核 +   去审核 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js new file mode 100644 index 000000000..7ec140512 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js @@ -0,0 +1,217 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var ATId; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.inittree(); + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + if (!ATId) { + learun.alert.warning('请选择分类！'); + return false; + } + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?ATId=' + ATId, + width: 780, + height: 560, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能修改！"); + return; + } + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?keyValue=' + keyValue, + width: 780, + height: 560, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能删除！"); + return; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 管理问题 + $('#lr_question').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能修改！"); + return; + } + learun.layerForm({ + id: 'formquestion', + title: '管理问题', + url: top.$.rootUrl + '/Ask/Ask_Question/Index?VID=' + keyValue, + width: 980, + height: 760, + btn:null + }); + } + }); + // 答题情况 + $('#lr_answer').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formanswer', + title: '答题情况', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/AnswerIndex?VID=' + keyValue, + width: 980, + height: 760, + btn:null + }); + } + }); + //  审核 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核！"); + return; + } + learun.layerConfirm('是否确认审核该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //  去审核 + $('#lr_unsubmit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status !== true && Status !== 'true') { + learun.alert.warning("当前项目已去审核！"); + return; + } + learun.layerConfirm('是否确认去审核该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/UnSubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + inittree: function () { + $('#companyTree').lrtree({ + url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree', + nodeClick: page.treeNodeClick + }); + }, + treeNodeClick: function (item) { + ATId = item.id; + $('#titleinfo').text(item.text); + page.search(); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetPageList', + headData: [ + { label: "问卷编号", name: "VSerial", width: 180, align: "left" }, + { label: "标题", name: "VTitle", width: 200, align: "left" }, + { + label: "类别", name: "ATId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type', + key: value, + keyId: 'atid', + callback: function (_data) { + callback(_data['atname']); + } + }); + } + }, + { label: "开始时间", name: "VStartTime", width: 100, align: "left" }, + { label: "结束时间", name: "VStopTime", width: 100, align: "left" }, + { label: "考核部门", name: "DepartmentIdsName", width: 150, align: "left" }, + { label: "考核人数", name: "SPVNum", width: 80, align: "left" }, + { label: "填写人数", name: "SPNum", width: 80, align: "left" }, + { label: "点击热度", name: "SClick", width: 80, align: "left" }, + { label: "排序", name: "VOrder", width: 80, align: "left" }, + { + label: "是否匿名", name: "VHide", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + }, + { + label: "审核标志", name: "Status", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + } + ], + mainId: 'VID', + isPage: true, + sidx:'VOrder' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.ATId = ATId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.cshtml new file mode 100644 index 000000000..d855c288e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.cshtml @@ -0,0 +1,48 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
    +
    +
    问卷编号
    + +
    +
    +
    标题*
    + +
    +
    +
    类别*
    +
    + +
    +
    +
    排序*
    + +
    +
    +
    开始时间*
    + +
    +
    +
    结束时间*
    + +
    +
    +
    考核部门
    +
    + +
    +
    +
    是否匿名*
    +
    +
    +
    +
    备注说明
    + +
    +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.js new file mode 100644 index 000000000..84c92bf26 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.js @@ -0,0 +1,73 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var pATId = request("ATId"); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#ATId').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree', + select: function(item) { + if (item != null && item != undefined) { + $("#ATName").val(item.text); + } + } + }); + if (!!pATId) { + $('#ATId').lrselectSet(pATId); + } + $('#DepartmentIds').lrDepartmentSelect({ type: 'treemultiple' }); + $('#VHide').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetFormData?keyValue=' + keyValue, + function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } else { + $("#VSerial").val(NewVSerial); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + $("#DepartmentIdsName").val($("#DepartmentIds").find(".lr-select-placeholder").text()); + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.cshtml new file mode 100644 index 000000000..9e142139d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.cshtml @@ -0,0 +1,57 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    分类
    +
    +
    +
    +
    +
    +
    + 未选择分类 - 分类信息 +
    +
    +
    +
    +
    +
    +
    +
    标题
    + +
    +
    +
    问卷编号
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  录入 +  修改 +  删除 +  管理问题 +  答题情况 +  结果分析 +  查看问卷 +
    +
    +   审核 +   去审核 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.js new file mode 100644 index 000000000..70fde3e14 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.js @@ -0,0 +1,237 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var ATId; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.inittree(); + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + if (!ATId) { + learun.alert.warning('请选择分类！'); + return false; + } + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?ATId=' + ATId, + width: 780, + height: 560, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能修改！"); + return; + } + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?keyValue=' + keyValue, + width: 780, + height: 560, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能删除！"); + return; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 管理问题 + $('#lr_question').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核不能修改！"); + return; + } + learun.layerForm({ + id: 'formquestion', + title: '管理问题', + url: top.$.rootUrl + '/Ask/Ask_Question/Index?VID=' + keyValue, + width: 980, + height: 760, + btn: null + }); + } + }); + // 结果分析 + $('#lr_analysis').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formanalysis', + title: '结果分析', + url: top.$.rootUrl + '/Ask/Ask_Question/AnalysisIndex?VID=' + keyValue, + width: 1000, + height: 760, + btn: null + }); + } + }); + // 答题情况 + $('#lr_answer').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formanswer', + title: '答题情况', + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/AnswerIndex?VID=' + keyValue, + width: 980, + height: 760, + btn: null + }); + } + }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperAdminView?VID=' + keyValue }); + } + }); + //  审核 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status === true || Status == 'true') { + learun.alert.warning("当前项目已审核！"); + return; + } + learun.layerConfirm('是否确认审核该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //  去审核 + $('#lr_unsubmit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status !== true && Status !== 'true') { + learun.alert.warning("当前项目已去审核！"); + return; + } + learun.layerConfirm('是否确认去审核该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/UnSubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + inittree: function () { + $('#companyTree').lrtree({ + url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree', + nodeClick: page.treeNodeClick + }); + }, + treeNodeClick: function (item) { + ATId = item.id; + $('#titleinfo').text(item.text); + page.search(); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetPageList', + headData: [ + { label: "问卷编号", name: "VSerial", width: 180, align: "left" }, + { label: "标题", name: "VTitle", width: 200, align: "left" }, + { + label: "类别", name: "ATId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type', + key: value, + keyId: 'atid', + callback: function (_data) { + callback(_data['atname']); + } + }); + } + }, + { label: "开始时间", name: "VStartTime", width: 100, align: "left" }, + { label: "结束时间", name: "VStopTime", width: 100, align: "left" }, + { label: "考核部门", name: "DepartmentIdsName", width: 150, align: "left" }, + { label: "考核人数", name: "SPVNum", width: 80, align: "left" }, + { label: "填写人数", name: "SPNum", width: 80, align: "left" }, + { label: "点击热度", name: "SClick", width: 80, align: "left" }, + { label: "排序", name: "VOrder", width: 80, align: "left" }, + { + label: "是否匿名", name: "VHide", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + }, + { + label: "审核标志", name: "Status", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + } + ], + mainId: 'VID', + isPage: true, + sidx: 'VOrder' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.ATId = ATId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.cshtml new file mode 100644 index 000000000..dab5b36eb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.cshtml @@ -0,0 +1,66 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity + + + + + +
    + +
    + + +
    @Model.VTitle
    +
    @(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")
    +
    +
    + @foreach (var question in Model.Ask_Questions) + { +
    +
    +
    +
    @question.QTitle @Html.Raw((question.QMust == true ? "*" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")
    +
    + @foreach (var questionitem in question.Ask_QuestionItems) + { +
    + @questionitem.ITitle +
    + } +
    +
    +
    + @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0) + { +
    + @question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle +
    + +
    +
    + } + +
    + } + +
    +
    本人声明在此报名表中填写的所有信息、 及提供与本表相关的一切资料均真实、准确
    +
    +
    +
    提  交
    +
    +
    +
    +
    +
    +
    + + + +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js new file mode 100644 index 000000000..2628e924b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js @@ -0,0 +1,77 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var VID = request("VID"); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.warpper').lrscroll(); + page.bind(); + }, + bind: function () { + $('.shenBtn').click(function () { + $('#AskPaper').trigger("validate"); + }); + //单选框 + $('.shenInputBox').on('click', + '.inputRadio', + function () { + if (!$(this).hasClass('active')) { + $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this)) + .removeClass('active'); + judgeRideo($(this)); + } + }); + + //多选框 + $('.inputCheck').click(function () { + if ($(this).hasClass('active')) { + $(this).removeClass('active'); + } else { + $(this).addClass('active'); + } + judgeRideo($(this)); + }); + //是否为其他选项判断 + function judgeRideo(obj) { + var parents = obj.parents('.signSec2Box'); + var inputs = parents.find('.shenInput3'); + if (parents.find("i[hasinput='yes']").hasClass('active')) { + inputs.css({ display: 'block' }); + } else { + inputs.css({ display: 'none' }); + } + } + $('#AskPaper').validator({ + timely: 2, + theme: 'yellow_right_effect', + valid: function (form) { + learun.layerConfirm('是否确认提交答案？', function (res) { + var answerlist = new Array(); + var strStuNo = $("#EmpNo").val(); + var strStuName = $("#EmpName").val(); + $(form).find("input.xuanze:checked").each(function (index, element) { + var itemvalue = { QID: $(this).attr("qid"), IID: $(this).attr("id"), UText: "", UID: strStuNo, UName:strStuName}; + if ($(this).attr("hasinput")=="yes") { + itemvalue.UText = $("#" + $(this).attr("id") + "Other").val(); + } + answerlist.push(itemvalue); + }); + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/TeacherSubmitForm', { answerlist: JSON.stringify(answerlist), VID: VID, "__RequestVerificationToken": $.lrToken }, function () { + learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close("paper" + VID); + }); + } + }); + } + }); + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.cshtml new file mode 100644 index 000000000..2ec2afcfe --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.cshtml @@ -0,0 +1,57 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity + + + + + +
    + +
    + + +
    @Model.VTitle
    +
    @(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")
    +
    +
    + @foreach (var question in Model.Ask_Questions) + { +
    +
    +
    +
    @question.QTitle @Html.Raw((question.QMust == true ? "*" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")
    +
    + @foreach (var questionitem in question.Ask_QuestionItems) + { +
    + @questionitem.ITitle +
    + } +
    +
    +
    + @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0) + { +
    + @question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle +
    + +
    +
    + } + +
    + } +
    +
    +
    + + + +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js new file mode 100644 index 000000000..2628e924b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js @@ -0,0 +1,77 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var VID = request("VID"); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.warpper').lrscroll(); + page.bind(); + }, + bind: function () { + $('.shenBtn').click(function () { + $('#AskPaper').trigger("validate"); + }); + //单选框 + $('.shenInputBox').on('click', + '.inputRadio', + function () { + if (!$(this).hasClass('active')) { + $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this)) + .removeClass('active'); + judgeRideo($(this)); + } + }); + + //多选框 + $('.inputCheck').click(function () { + if ($(this).hasClass('active')) { + $(this).removeClass('active'); + } else { + $(this).addClass('active'); + } + judgeRideo($(this)); + }); + //是否为其他选项判断 + function judgeRideo(obj) { + var parents = obj.parents('.signSec2Box'); + var inputs = parents.find('.shenInput3'); + if (parents.find("i[hasinput='yes']").hasClass('active')) { + inputs.css({ display: 'block' }); + } else { + inputs.css({ display: 'none' }); + } + } + $('#AskPaper').validator({ + timely: 2, + theme: 'yellow_right_effect', + valid: function (form) { + learun.layerConfirm('是否确认提交答案？', function (res) { + var answerlist = new Array(); + var strStuNo = $("#EmpNo").val(); + var strStuName = $("#EmpName").val(); + $(form).find("input.xuanze:checked").each(function (index, element) { + var itemvalue = { QID: $(this).attr("qid"), IID: $(this).attr("id"), UText: "", UID: strStuNo, UName:strStuName}; + if ($(this).attr("hasinput")=="yes") { + itemvalue.UText = $("#" + $(this).attr("id") + "Other").val(); + } + answerlist.push(itemvalue); + }); + if (res) { + learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/TeacherSubmitForm', { answerlist: JSON.stringify(answerlist), VID: VID, "__RequestVerificationToken": $.lrToken }, function () { + learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close("paper" + VID); + }); + } + }); + } + }); + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.cshtml new file mode 100644 index 000000000..d508f79ca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.cshtml @@ -0,0 +1,56 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity + + + + + +
    + +
    +
    @Model.VTitle
    +
    @(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")
    +
    +
    + @foreach (var question in Model.Ask_Questions) + { +
    +
    +
    +
    @question.QTitle @Html.Raw((question.QMust == true ? "*" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")
    +
    + @foreach (var questionitem in question.Ask_QuestionItems) + { +
    + @questionitem.ITitle +
    + } +
    +
    +
    + @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0) + { +
    + @question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle +
    + +
    +
    + } + +
    + } + +
    +
    +
    + + + +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js new file mode 100644 index 000000000..e0030c91a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js @@ -0,0 +1,55 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var VID = request("VID"); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.warpper').lrscroll(); + page.bind(); + }, + bind: function () { + //单选框 + $('.shenInputBox').on('click', + '.inputRadio', + function () { + if (!$(this).hasClass('active')) { + $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this)) + .removeClass('active'); + judgeRideo($(this)); + } + }); + + //多选框 + $('.inputCheck').click(function () { + if ($(this).hasClass('active')) { + $(this).removeClass('active'); + } else { + $(this).addClass('active'); + } + judgeRideo($(this)); + }); + //是否为其他选项判断 + function judgeRideo(obj) { + var parents = obj.parents('.signSec2Box'); + var inputs = parents.find('.shenInput3'); + if (parents.find("i[hasinput='yes']").hasClass('active')) { + inputs.css({ display: 'block' }); + } else { + inputs.css({ display: 'none' }); + } + } + $('form').find("input.xuanze:checked").each(function (index, element) { + if ($(this).attr("hasinput") == "yes") { + $("#" + $(this).attr("id") + "Other").parents(".shenInput3").css({ display: 'block' }); + } + }); + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.cshtml new file mode 100644 index 000000000..d9c60b86f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "教师问卷管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    标题
    + +
    +
    +
    问卷编号
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  开始考核 +  查看答题情况 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js new file mode 100644 index 000000000..72a3ffb4f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js @@ -0,0 +1,93 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：教师问卷管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + $('#lr_start').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('IsAnswer'); + if (Status === true || Status === 'true') { + learun.alert.warning("当前项目已交卷！"); + return; + } + top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/Paper?VID=' + keyValue }); + } + }); + //查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + var EmpNo = $('#gridtable').jfGridValue('EmpNo'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('IsAnswer'); + if (Status === false || Status === 'false') { + learun.alert.warning("当前项目未交卷！"); + return; + } + top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperView?VID=' + keyValue + '&EmpNo=' + EmpNo }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetTeacherPageList', + headData: [ + { label: "问卷编号", name: "VSerial", width: 180, align: "left" }, + { label: "标题", name: "VTitle", width: 200, align: "left" }, + { + label: "类别", name: "ATId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type', + key: value, + keyId: 'atid', + callback: function (_data) { + callback(_data['atname']); + } + }); + } + }, + { label: "开始时间", name: "VStartTime", width: 100, align: "left" }, + { label: "结束时间", name: "VStopTime", width: 100, align: "left" }, + { + label: "是否交卷", name: "IsAnswer", width: 80, align: "left", formatter: function (cellvalue) { + return cellvalue === true ? "" : ""; + } + }, + { label: "考核评分", name: "TotalScore", width: 80, align: "left" }, + { label: "提交时间", name: "CreateDate", width: 80, align: "left" } + ], + mainId: 'VID', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.EmpNo = EmpNo; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml index e60a348e4..11c191eb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.cshtml @@ -21,12 +21,6 @@
    盘点说明
    -
    -
    明细操作
    - - - -
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js index 6c6fe0fcf..c5104d66a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js @@ -27,62 +27,32 @@ var bootstrap = function ($, learun) { var page = { init: function () { $('.lr-form-wrap').lrscroll(); - - $("#detailadd").on('click', function () { - selectedRow = null; - learun.layerForm({ - id: 'formitem', - title: '新增明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_InventoryItemApply/Form', - width: 860, - height: 600, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - $("#detailedit").on('click', function () { - Ass_InventoryItem - var keyValue = $('#Ass_InventoryItem').jfGridValue('AAIId'); - selectedRow = $('#Ass_InventoryItem').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'formitem', - title: '编辑明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_InventoryItemApply/Form?keyValue=' + keyValue, - width: 860, - height: 600, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - $("#detaildel").on('click', function () { - var keyValue = $('#Ass_InventoryItem').jfGridValue('AAIId'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res, index) { - if (res) { - $.each(tempdatra, function (key, val) { - if (tempdatra[key].AAIId === keyValue) { - pricecount -= tempdatra[key].AAIPrice * tempdatra[key].AAIStock; - tempdatra.splice(key, 1); - } - }); - //$("#AOPrice").val(pricecount); - $('#Ass_InventoryItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber)); - top.layer.close(index); - } - }); - } - }); - page.bind(); page.initData(); }, bind: function () { $('#Ass_InventoryItem').jfGrid({ headData: [ + { + label: '是否盘点', name: 'AIsCheck', width: 150, align: 'left', formatter: function (cellvalue, row) { + if (cellvalue === true) { + return '已盘点'; + } else { + return '未盘点'; + } + } + }, + { + label: '盘点结果', name: 'AResult', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'InventoryResult', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '资产编号', name: 'AAICode', width: 150, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs index 249f1d643..418eb4fdd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System.Collections; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,8 +36,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } + + /// + /// 日程管理 + /// + /// + [HttpGet] + public ActionResult ScheduleIndex() + { + return View(); + } + #endregion #region 获取数据 @@ -74,6 +86,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = schoolCalendarIBLL.GetList(queryJson); return Success(data); } + /// + /// 获取日程数据 + /// + /// + [HttpGet] + public ActionResult GetListForSchedule() + { + var userInfo = LoginUserInfo.Get(); + List data = new List(); + foreach (SchoolCalendarEntity entity in schoolCalendarIBLL.GetList()) + { + Hashtable ht = new Hashtable(); + ht["id"] = entity.ID; + ht["academicYearNo"] = "【" + entity.AcademicYearNo + "】"; + ht["title"] = entity.Content; + ht["end"] = (entity.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.EndTime.ToString().Substring(0, 2) + ":" + entity.EndTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["start"] = (entity.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.StartTime.ToString().Substring(0, 2) + ":" + entity.StartTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["allDay"] = false; + data.Add(ht); + } + return ToJsonResult(data); + } + /// /// 获取表单数据 /// @@ -82,8 +117,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity( keyValue ); - var jsonData = new { + var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity(keyValue); + var jsonData = new + { SchoolCalendar = SchoolCalendarData, }; return Success(jsonData); @@ -114,11 +150,49 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { - UserInfo userInfo = LoginUserInfo.Get(); SchoolCalendarEntity entity = strEntity.ToObject(); - schoolCalendarIBLL.SaveEntity(userInfo,keyValue,entity); + UserInfo userInfo = LoginUserInfo.Get(); + SchoolCalendarEntity entity = strEntity.ToObject(); + //根据学年和学期查询 + var model = schoolCalendarIBLL.GetSchoolCalendarEntityByNo(entity.AcademicYearNo, entity.Semester); + if (string.IsNullOrEmpty(keyValue)) + { + if (model != null) + { + return Fail("当前学期已存在！"); + } + } + else + { + if (model != null && model.ID != keyValue) + { + return Fail("当前学期已存在！"); + } + } + schoolCalendarIBLL.SaveEntity(userInfo, keyValue, entity); return Success("保存成功！"); } #endregion + #region 扩展数据 + /// + /// 学年 + /// + /// + [HttpGet] + public ActionResult GenerateNearByAcademic() + { + return Success(Learun.Util.WebHelper.GenerateNearByAcademic()); + } + /// + /// 学期 + /// + /// + [HttpGet] + public ActionResult GenerateNearBySemeter() + { + return Success(Learun.Util.WebHelper.GenerateNearBySemeter()); + } + #endregion + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs index 59c8df85b..4fe77cd56 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs @@ -741,7 +741,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } } - + /// + /// 生成帐号 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult Generate() + { + stuEnrollIBLL.GenerateAccout(); + return Success("生成成功！"); + } [HttpPost] [AjaxOnly] diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_DefaultPwdConfigController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_DefaultPwdConfigController.cs new file mode 100644 index 000000000..06bc4449f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_DefaultPwdConfigController.cs @@ -0,0 +1,131 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-01-19 11:14 + /// 描 述：默认密码配置 + /// + public class Sys_DefaultPwdConfigController : MvcControllerBase + { + private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sys_DefaultPwdConfigIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Sys_DefaultPwdConfigData = sys_DefaultPwdConfigIBLL.GetSys_DefaultPwdConfigEntity( keyValue ); + var jsonData = new { + Sys_DefaultPwdConfig = Sys_DefaultPwdConfigData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sys_DefaultPwdConfigIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Sys_DefaultPwdConfigEntity entity = strEntity.ToObject(); + entity.IsEnabled = false; + sys_DefaultPwdConfigIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + + /// + /// 启用 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoEnabled(string keyValue) + { + sys_DefaultPwdConfigIBLL.DoEnabled(keyValue); + return Success("操作成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 66586b87e..1408b196d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -151,10 +151,10 @@
    部门*
    -
    + @*
    系部
    -
    +
    *@
    岗位类别
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index bc46bf4db..5dda34638 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -48,7 +48,7 @@ var bootstrap = function ($, learun) { $("#ForeignLanguageNo").parent().hide(); $("#EmpSortNo").parent().hide(); $("#EmpFullTimeNo").parent().hide(); - $("#DeptNo").parent().hide(); + //$("#DeptNo").parent().hide(); $("#TitleOfTechPostNo").parent().hide(); $("#InSchoolDate").parent().hide(); $("#resume").parent().hide(); @@ -128,7 +128,7 @@ var bootstrap = function ($, learun) { $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' }); $('#Photo').lrUploader(); $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index d50374b93..a3ce1de60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
    部门
    -
    + @*
    系部
    -
    +
    *@
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index 6ed691ca9..6067b3676 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 3b9d93497..cad878572 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -22,10 +22,10 @@
    联系电话
    -
    + @*
    系部
    -
    +
    *@
    部门
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 0724f1a8f..31097451c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -373,19 +373,19 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "系部", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, + //{ + // label: "系部", name: "DeptNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptno', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // } + //}, { label: "性别", name: "GenderNo", width: 80, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml index be9e4e2be..7922d33e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml @@ -36,7 +36,7 @@ 政治面貌 @Model.PartyFaceNo 入党时间 - @Model.JoinPartyTime + @(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "") 最高学历（学位） @Model.HighestRecord diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml index 2fd75c575..f4aa3e788 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml @@ -3,13 +3,21 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    + @*
    学年
    学期
    +
    *@ +
    +
    学年*
    +
    +
    +
    +
    学期*
    +
    开始日期
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js index 3b28a6b2d..f08799931 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js @@ -15,8 +15,22 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $("#Semester").lrDataItemSelect({ code: 'Semester' }); - + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearByAcademic', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearBySemeter', + value: 'value', + text: 'text' + }); }, initData: function () { if (!!keyValue) { @@ -46,6 +60,7 @@ var bootstrap = function ($, learun) { if (!!callBack) { callBack(); } + learun.frameTab.currentIframe().location.reload(); }); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml new file mode 100644 index 000000000..fa709950c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml @@ -0,0 +1,166 @@ + + + + + + 日程管理 + + + + + @Html.AppendCssFile( + "/Views/LR_Content/style/lr-common.css", + "/Views/LR_Content/style/lr-iframe-index.css" + ) + + + + +
    +
    +
    + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js index dba4d2c34..c37f14944 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js @@ -187,7 +187,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left" }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js index 11302c109..dd38e619a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js @@ -159,7 +159,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js index 3e05f6b4b..bccc8784b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js @@ -239,7 +239,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "届别", name: "FreshType", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js index fbeee4821..58770a24c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js @@ -205,7 +205,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js index 8b37576d8..9c4781565 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js @@ -205,7 +205,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js index 80813a07d..e21eac40d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js @@ -201,7 +201,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js index 85145bfff..f7c5ece23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js @@ -367,7 +367,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js index 05e42e22c..21c8ef7c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js @@ -268,7 +268,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js index 691929fc6..d870739d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js @@ -237,7 +237,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js index 14a49d27d..d3f87b190 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js @@ -197,7 +197,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js index 99bc91916..f7e9d9bc2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js @@ -235,7 +235,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js index 237d7c948..b1679df3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js @@ -127,7 +127,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js index 1fbb443b0..77163f161 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js @@ -323,7 +323,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml index 2b58f639f..1cc583b92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml @@ -56,6 +56,9 @@
    +
    +  生成帐号 +
     录入  查看 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js index ec38c618d..4a33e7adb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js @@ -124,11 +124,8 @@ var bootstrap = function ($, learun) { }); } - - }); }); - //确认报到 $("#lr_sign").on('click', function () { @@ -144,10 +141,7 @@ var bootstrap = function ($, learun) { }); } - - }); - } }); @@ -166,15 +160,9 @@ var bootstrap = function ($, learun) { }); } - - }); - } }); - - - //确认报到 $("#lr_report").on('click', function () { @@ -190,10 +178,7 @@ var bootstrap = function ($, learun) { }); } - - }); - } }); @@ -212,14 +197,20 @@ var bootstrap = function ($, learun) { }); } - - }); - } }); - + //生成帐号 + $('#lr_generate').on('click', function () { + learun.layerConfirm('是否确认生成帐号?', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Generate', {}, function () { + refreshGirdData(); + }); + } + }); + }); }, // 初始化列表 initGird: function () { @@ -310,7 +301,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val,'yyyy-MM-dd') } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.cshtml new file mode 100644 index 000000000..cabfef4e5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "默认密码配置"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    密码名称*
    + +
    +
    +
    密码*
    + +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.js new file mode 100644 index 000000000..83feddc3b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.js @@ -0,0 +1,51 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-01-19 11:14 + * 描 述：默认密码配置 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.cshtml new file mode 100644 index 000000000..eb3bddb53 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "默认密码配置"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    密码名称
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +
    +
    +  启用 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js new file mode 100644 index 000000000..9c43797f2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js @@ -0,0 +1,112 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-01-19 11:14 + * 描 述：默认密码配置 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 启用 + $('#lr_enabled').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var IsEnabled = $('#gridtable').jfGridValue('IsEnabled'); + if (IsEnabled == true) { + learun.alert.warning("当前项已启用！"); + return false; + } + learun.layerConfirm('是否确认启用该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/DoEnabled', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/GetPageList', + headData: [ + { label: "密码名称", name: "PwdName", width: 150, align: "left"}, + { label: "密码", name: "Pwd", width: 150, align: "left"}, + { + label: "是否启用", name: "IsEnabled", width: 100, align: "left", + formatter: function (cellvalue, rowObject) { + return cellvalue == true ? "" : ""; + } + }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js index 22265e04f..de62521d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js @@ -147,7 +147,7 @@ var bootstrap = function ($, learun) { }; learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/ZhuRenP', postData, function (res) { - refreshGirdData(res, {}); + page.search(); }); } }); @@ -167,7 +167,7 @@ var bootstrap = function ($, learun) { strEntity: JSON.stringify(formData) }; learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/XiaoZhangP', postData, function (res) { - refreshGirdData(res, {}); + page.search(); }); } }); @@ -207,7 +207,7 @@ var bootstrap = function ($, learun) { if (res) { processId = learun.newGuid(); learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/OverIssue', { keyValue: keyValue, }, function (res) { - refreshGirdData(res, {}); + page.search(); }); } }); @@ -350,20 +350,20 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; - refreshGirdData = function (res, postData) { - if (res.code == 200) { - // 发起流程 - var postData = { - schemeCode: 'Sys_ReceiveDocument',// 填写流程对应模板编号 - processId: processId, - level: '1', - }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { - learun.loading(false); - }); + //refreshGirdData = function (res, postData) { + // if (res.code == 200) { + // // 发起流程 + // var postData = { + // schemeCode: 'Sys_ReceiveDocument',// 填写流程对应模板编号 + // processId: processId, + // level: '1', + // }; + // learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + // learun.loading(false); + // }); - page.search(); - } - }; + // page.search(); + // } + //}; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js index 4eae20700..c1b863f16 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js @@ -8,8 +8,8 @@ var refreshGirdData; var selectedRow; var bootstrap = function ($, learun) { "use strict"; - var startTime; - var endTime; + var startTime=''; + var endTime=''; var page = { init: function () { page.initGird(); @@ -193,6 +193,7 @@ var bootstrap = function ($, learun) { sidx: 'SendTime', sord: 'DESC' }); + page.search(); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs new file mode 100644 index 000000000..5cd41d24d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageController : MvcControllerBase + { + private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = sSO_Drag_CardSortManageIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sSO_Drag_CardSortManageIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var data = sSO_Drag_CardSortManageIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sSO_Drag_CardSortManageIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,SSO_Drag_CardSortManageEntity entity) + { + sSO_Drag_CardSortManageIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs new file mode 100644 index 000000000..e1485361f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageController : MvcControllerBase + { + private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = sSO_Drag_DesktopManageIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sSO_Drag_DesktopManageIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var data = sSO_Drag_DesktopManageIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sSO_Drag_DesktopManageIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,SSO_Drag_DesktopManageEntity entity) + { + sSO_Drag_DesktopManageIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml new file mode 100644 index 000000000..38067da43 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    主键*
    + +
    +
    +
    用户*
    + +
    +
    +
    模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式*
    + +
    +
    +
    桌面Id*
    + +
    +
    +
    卡片块排序*
    + +
    +
    +@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js new file mode 100644 index 000000000..8340ba761 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:54 + * 描 述：网上办事大厅拖拽版-卡片块排序管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml new file mode 100644 index 000000000..e433c543c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    树形目录
    +
    +
    +
    +
    +
    +
    标题
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js new file mode 100644 index 000000000..ca3f0dc19 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js @@ -0,0 +1,94 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:54 + * 描 述：网上办事大厅拖拽版-卡片块排序管理 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form', + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/DeleteForm', { keyValue: keyValue}, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/GetPageList', + headData: [ + { label: '主键', name: 'Id', width: 200, align: "left" }, + { label: '用户', name: 'UserId', width: 200, align: "left" }, + { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" }, + { label: '桌面Id', name: 'DesktopId', width: 200, align: "left" }, + { label: '卡片块排序', name: 'CardSort', width: 200, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml new file mode 100644 index 000000000..fbd990750 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml @@ -0,0 +1,31 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-桌面管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    主键*
    + +
    +
    +
    用户*
    + +
    +
    +
    模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式*
    + +
    +
    +
    桌面名称*
    + +
    +
    +
    桌面编号*
    + +
    +
    +
    排序号*
    + +
    +
    +@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js new file mode 100644 index 000000000..8997ddfd3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:47 + * 描 述：网上办事大厅拖拽版-桌面管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml new file mode 100644 index 000000000..ffa2e7665 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-桌面管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    树形目录
    +
    +
    +
    +
    +
    +
    标题
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js new file mode 100644 index 000000000..2246bd730 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:47 + * 描 述：网上办事大厅拖拽版-桌面管理 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form', + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/DeleteForm', { keyValue: keyValue}, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/GetPageList', + headData: [ + { label: '主键', name: 'Id', width: 200, align: "left" }, + { label: '用户', name: 'UserId', width: 200, align: "left" }, + { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" }, + { label: '桌面名称', name: 'DesktopName', width: 200, align: "left" }, + { label: '桌面编号', name: 'DesktopCode', width: 200, align: "left" }, + { label: '排序号', name: 'Sort', width: 200, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 9de58d880..c201f2961 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Web.Mvc; using Learun.Application.Organization; using Learun.Application.Base.AuthorizeModule; +using Learun.Application.TwoDevelopment.LR_LGManager; namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { @@ -18,6 +19,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers public class NWFProcessController : MvcControllerBase { private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); + LC_hetongIBLL lcHetongIbll=new LC_hetongBLL(); private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); @@ -170,6 +172,11 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + [HttpGet] + public ActionResult ContractFilingMonitor() + { + return View(); + } /// /// 人事归档 /// @@ -243,6 +250,34 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers return View(); } + /// + /// 流程时间统计 + /// + /// + [HttpGet] + public ActionResult StatisticTimeIndex() + { + return View(); + } + /// + /// 流程时间统计-饼图 + /// + /// + [HttpGet] + public ActionResult StatisticTimeForm() + { + return View(); + } + /// + /// 流程次数统计 + /// + /// + [HttpGet] + public ActionResult StatisticCountIndex() + { + return View(); + } + #endregion @@ -291,6 +326,22 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + + [HttpGet] + [AjaxOnly] + public ActionResult GetContractList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = lcHetongIbll.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } /// /// 获取我的流程信息列表 /// @@ -643,7 +694,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers /// /// 审批流程 /// - /// 流程审批操作码agree 同意 disagree 不同意 lrtimeout 超时 + /// 流程审批操作码agree 同意 disagree 不同意 lrtimeout 超时 back 退回至上一个审核节点 /// 流程审批操名称 /// 流程进程主键 /// 流程任务主键 @@ -658,6 +709,15 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers try { + //if (operationCode == "back")//退回至上一个审核节点【暂定】 + //{ + // nWFProcessIBLL.AuditFlow2(operationCode, operationName, processId, taskId, des, auditors, stamp, signUrl, userInfo); + //} + //else + //{ + // nWFProcessIBLL.AuditFlow(operationCode, operationName, processId, taskId, des, auditors, stamp, signUrl, userInfo); + //} + nWFProcessIBLL.AuditFlow(operationCode, operationName, processId, taskId, des, auditors, stamp, signUrl, userInfo); return Success("流程审批成功"); } @@ -838,5 +898,84 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers return Success("添加成功"); } #endregion + + #region 流程效率分析 + + /// + /// 获取审批时间统计数据 + /// + /// + /// + public ActionResult GetStatisticTimeData(string processId) + { + var taskdata = nWFTaskIBLL.GetALLTaskList(processId).OrderByDescending(x => x.F_CreateDate); + + var legendData = new List(); + var seriesData = new List(); + foreach (var item in taskdata) + { + legendData.Add(item.F_ModifyUserName); + seriesData.Add(new WfSchemeReportModelOfPie2() + { + name = item.F_ModifyUserName, + value = (item.F_ModifyDate - item.F_CreateDate).HasValue ? (item.F_ModifyDate - item.F_CreateDate).Value.TotalMinutes.ToDecimal(2).ToString() : "0" + }); + } + + var jsonData = new + { + legendData = legendData, + seriesData = seriesData + }; + + return Success(jsonData); + } + + /// + /// 获取审批次数统计数据 + /// + /// + /// + public ActionResult GetStatisticCountData(string queryJson) + { + var taskdata = nWFTaskIBLL.GetFinishTaskList(); + + if (!string.IsNullOrEmpty(queryJson)) + { + var queryParam = queryJson.ToJObject(); + if (!queryParam["year"].IsEmpty()) + { + var year = queryParam["year"].ToInt(); + taskdata = taskdata.Where(x => x.F_ModifyDate.HasValue && x.F_ModifyDate.Value.Year == year); + } + } + var taskgroup = taskdata.GroupBy(x => new { x.F_ModifyUserId, x.F_ModifyUserName }).Select(x => new + { + userId = x.Key.F_ModifyUserId, + userName = x.Key.F_ModifyUserName, + count = x.Select(y => y.F_Id).Count() + }); + + var legendData = new List(); + var seriesData = new List(); + foreach (var item in taskgroup) + { + legendData.Add(item.userName); + seriesData.Add(new WfSchemeReportModelOfPie() + { + value = item.count, + name = item.userName + }); + } + + var jsonData = new + { + legendData = legendData, + seriesData = seriesData + }; + + return Success(jsonData); + } + #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml index 59fcb8238..57d390d29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml @@ -2,21 +2,9 @@ ViewBag.Title = "流程监控"; Layout = "~/Views/Shared/_Index.cshtml"; } -
    -
    -
    -
    -
      -
    • 未完成
      • -
    • 已完成
      • -
    • 作废
      • -
    -
    -
    -
    - +
    -
    +
    @@ -35,8 +23,6 @@
     查看 -  指派审核人 -  作废
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js index ccf66716c..0fb5e7356 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js @@ -10,12 +10,10 @@ var bootstrap = function ($, learun) { var categoryId = '1'; var logbegin = ''; var logend = ''; - var F_EnabledMark = false; var page = { init: function () { $('#lr_verify').hide(); - page.initleft(); page.initGrid(); page.bind(); }, @@ -110,70 +108,32 @@ var bootstrap = function ($, learun) { }); }, initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList', + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList', headData: [ + { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, + { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" }, + { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" }, + { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" }, + { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" }, + { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" }, + { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" }, { - label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) { - if (row.F_SchemeName != row.F_Title && row.F_Title) { - return row.F_SchemeName + "(" + row.F_Title + ")"; - } - else { - return row.F_SchemeName; - } + label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, - //{ - // label: "等级", name: "F_Level", width: 60, align: "center", - // formatter: function (cellvalue) { - // switch (cellvalue) { - // case 0: - // return '普通'; - // break; - // case 1: - // return '重要'; - // break; - // case 2: - // return '紧急'; - // break; - // default: - // return '普通'; - // break; - // } - // } - //}, { - label: "状态", name: "F_EnabledMark", width: 70, align: "center", - formatter: function (cellvalue, row) { - if (row.F_IsFinished == 0) { - if (cellvalue == 1) { - if (row.F_IsUrge == "1" && categoryId == '2') { - return "催办加急"; - } - return "运行中"; - } else if (cellvalue == 2) { - return "草稿"; - } else { - return "作废"; - } - } - else { - return "结束"; - } - + label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, - { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" }, - { - label: "时间", name: "F_CreateDate", width: 150, align: "left", - formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); - } - } + { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" }, + { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" } ], mainId: 'F_Id', isPage: true, - sidx: 'F_CreateDate DESC', + sidx: 'F_ModifyDate DESC', dblclick: function () { page.eye(); } @@ -184,24 +144,12 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = logbegin; param.EndTime = logend; - param.categoryId = categoryId; - param.F_Category = '合同类'; - if (F_EnabledMark) { - param.F_EnabledMark = 3; - } + param.F_IsFinished = 1; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, eye: function () { - var processId = $('#gridtable').jfGridValue('F_Id') || ''; - var title = $('#gridtable').jfGridValue('F_Title'); - var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); - - if (schemeName != title && title) { - title = schemeName + "(" + title + ")"; - } - else { - title = schemeName; - } + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('LC_htmc'); if (learun.checkrow(processId)) { learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml new file mode 100644 index 000000000..62ebf7269 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml @@ -0,0 +1,50 @@ +@{ + ViewBag.Title = "流程监控"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
      +
    • 未完成
      • +
    • 已完成
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    + +
    +
    +  查看 +
    +
    +
    + +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js new file mode 100644 index 000000000..f5075048a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js @@ -0,0 +1,124 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '0'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList', + headData: [ + { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, + { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" }, + { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" }, + { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" }, + { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" }, + { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" }, + { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" }, + { + label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" }, + { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" } + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_ModifyDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.F_IsFinished = categoryId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('LC_htmc'); + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml index a755cca1a..178caea77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml @@ -15,9 +15,9 @@
  • 流程信息
    • -
    +
    -
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 075978941..552159cb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -778,8 +778,9 @@ var bootstrap = function ($, learun) { // 审批流程 learun.loading(true, '流程加签...'); var postData = { - //des: formdata.des, - des: $('#des').val(), + des: formdata.des, + //liangkun 2020-12-30改 第一次加签的时候没取到备注 + //des: $('#des').val(), userId: formdata.auditorId, processId: nwflow.processId, taskId: nwflow.taskId diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js index e18767965..1c9bbbd24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js @@ -26,7 +26,8 @@ var bootstrap = function ($, learun) { type: 'multiple', data: _list, value: 'Id', - text: 'Name' + text: 'Name', + allowSearch:true }); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.cshtml new file mode 100644 index 000000000..4f0c13b80 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.cshtml @@ -0,0 +1,33 @@ + +@{ + ViewBag.Title = "流程次数统计"; + Layout = "~/Views/Shared/_ReportTemplate.cshtml"; +} + +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    +  刷新 +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js new file mode 100644 index 000000000..a024e7b27 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js @@ -0,0 +1,76 @@ + +var bootstrap = function ($, learun) { + "use strict"; + var year = ""; + var page = { + init: function () { + page.bind(); + page.initChart(); + }, + bind: function () { + //当前年 + var now = learun.formatDate(new Date(), 'yyyy'); + $('#year').val(now); + year = now; + // 刷新 + $('#lr-replace').on('click', function () { + location.reload(); + }); + //查询 + $('#btn_Search').on('click', function () { + year = $('#year').val(); + page.search(); + }); + }, + initChart: function () { + var myChart1 = echarts.init(document.getElementById('main')); + var queryJson = { year: year }; + learun.httpAsyncPost(top.$.rootUrl + "/LR_NewWorkFlow/NWFProcess/GetStatisticCountData", { queryJson: JSON.stringify(queryJson)}, function (res) { + if (res.code == 200) { + var option1 = { + title: { + text: year + '年流程审批次数分析图', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
    {b} : {c}次 ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.legendData + }, + series: [ + { + name: '审批人', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.seriesData, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + myChart1.setOption(option1); + + } + }); + }, + search: function (param) { + param = param || {}; + param.year = year; + page.initChart(); + } + + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.cshtml new file mode 100644 index 000000000..df13387af --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.cshtml @@ -0,0 +1,18 @@ + +@{ + ViewBag.Title = "审批时间统计"; + Layout = "~/Views/Shared/_WorkFlowNewForm.cshtml"; +} + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js new file mode 100644 index 000000000..df54e5b43 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js @@ -0,0 +1,58 @@ +var processId = request('processId'); // 流程实例主键 + +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.initChart(); + }, + bind: function () { + + }, + initChart: function () { + var myChart1 = echarts.init(document.getElementById('main')); + learun.httpAsyncPost(top.$.rootUrl + "/LR_NewWorkFlow/NWFProcess/GetStatisticTimeData", { processId: processId }, function (res) { + if (res.code == 200) { + var option1 = { + title: { + text: '审批时间分析图', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
    {b} : {c}分 ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.legendData + }, + series: [ + { + name: '审批人', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.seriesData, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + myChart1.setOption(option1); + + } + }); + }, + + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.cshtml new file mode 100644 index 000000000..2bd379ecd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.cshtml @@ -0,0 +1,40 @@ +@{ + ViewBag.Title = "流程时间统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    + +
    +
    +  审批时间统计 +
    +
    +
    + +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js new file mode 100644 index 000000000..404411f07 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js @@ -0,0 +1,129 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程时间统计 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '2'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 审批时间统计 + $('#lr_statistic').on('click', function () { + var processId = $('#gridtable').jfGridValue('F_Id'); + if (learun.checkrow(processId)) { + learun.layerForm({ + id: 'StatisticTimeForm', + title: '审批时间统计', + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/StatisticTimeForm?processId=' + processId, + height: 600, + width: 1000, + btn:null + }); + } + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList', + headData: [ + { + label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) { + if (row.F_SchemeName != row.F_Title && row.F_Title) { + return row.F_SchemeName + "(" + row.F_Title + ")"; + } + else { + return row.F_SchemeName; + } + } + }, + { + label: "状态", name: "F_EnabledMark", width: 70, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else { + return "作废"; + } + } + else { + return "结束"; + } + + } + }, + { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" }, + { + label: "时间", name: "F_CreateDate", width: 150, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); + } + } + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml index f3e326027..618227a63 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml @@ -18,7 +18,7 @@ 兹委托@ViewBag.UserName(身份证号码：@ViewBag.IDCard)负责联系办理业务并签订合同，合同名称：
    - @ViewBag.Htmc + @ViewBag.Htmc
    或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js index 9c09a4ce1..c4bac52f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js @@ -59,6 +59,10 @@ var bootstrap = function ($, learun) { } var postData = $('.lr-item').lrGetFormData(); var F_Password = $.md5(postData.F_Password); + if (!keyValue) { + learun.alert.error("请选择印章！"); + return false; + } learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) { callBack(keyValue); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs index bd079127d..a9b7cca30 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs @@ -477,7 +477,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers string access_token = weixintokenobj.access_token; string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," + "\"template_id\":\"" + weixintasktempid + "\"," + - "\"url\":\"" + weixintaskurl + "\"," + + "\"url\":\"" + weixintaskurl + "/#/?page=notice\"," + "\"data\":{" + "\"first\": {\"value\":\"您有新的未读通知公告\",\"color\":\"#173177\"}," + "\"keyword1\":{\"value\":\"未读通知公告\",\"color\":\"#173177\"}," + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/UploadifyForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/UploadifyForm.js index cd55a39c3..9906a1f1a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/UploadifyForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/UploadifyForm.js @@ -31,7 +31,7 @@ var bootstrap = function ($, learun) { dnd: '#lr_form_file_queue', paste: 'document.body', accept: { - extensions: "jpg,gif,png,bmp,jpeg,doc,docx,ppt,pptx,xls,xlsx,pdf,txt,rar,zip,csv" + extensions: "*" }, multiple: true, // 上传参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs index cdbd2adc1..e11189411 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs @@ -6,6 +6,8 @@ using Learun.Application.Base.AuthorizeModule; using System.Linq; using System; using Learun.Application.Base.SystemModule; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Configuration; namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers { @@ -23,6 +25,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); private RoleIBLL roleIBLL = new RoleBLL(); + private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL(); + #region 获取视图 @@ -334,7 +338,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult ResetPassword(string keyValue) { - userIBLL.ResetPassword(keyValue); + string defpwd = ConfigurationManager.AppSettings["defaultpwd"]; + //读取默认密码配置中已启用的密码 + if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null) + { + defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd; + } + userIBLL.ResetPassword(keyValue, defpwd); return Success("操作成功！"); } /// @@ -346,7 +356,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult ResetPasswordEight(string keyValue) { - userIBLL.ResetPasswordEight(keyValue); + string defpwd = ConfigurationManager.AppSettings["defaultpwdeight"]; + //读取默认密码配置中已启用的密码 + if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null) + { + defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd; + } + userIBLL.ResetPasswordEight(keyValue, defpwd); return Success("操作成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml index 2a2881c1e..3309d0b52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml @@ -22,6 +22,10 @@
    部门性质
    +
    +
    +
    是否虚拟部门
    +
    上级部门
    @@ -30,16 +34,16 @@
    负责人
    -
    +
    分管校长
    -
    - +
    +
    @*
    -
    公告类别
    -
    -
    *@ +
    公告类别
    +
    +
    *@
    电话号
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js index 6db751a57..893d0e625 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js @@ -21,6 +21,8 @@ var bootstrap = function ($, learun) { bind: function () { // 部门性质 $('#F_Nature').lrDataItemSelect({ code: 'DepartmentNature', maxHeight: 230 }); + $('#F_IsVirtualization').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#F_IsVirtualization').lrselectSet(false); // 上级部门 $('#F_ParentId').lrDepartmentSelect({ companyId: companyId, maxHeight: 160 }); $("#F_SchoolMasterId").lrformselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js index 8cdcd2e9a..29741f684 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js @@ -115,6 +115,15 @@ var bootstrap = function ($, learun) { { label: "部门编号", name: "F_EnCode", width: 100, align: "left" }, { label: "部门简称", name: "F_ShortName", width: 100, align: "left" }, { label: "部门性质", name: "F_Nature", width: 100, align: "left" }, + { + label: "是否虚拟部门", name: "F_IsVirtualization", width: 100, align: "left", formatter: function (cellvalue) { + if (cellvalue) { + return '是'; + } else{ + return '否'; + } + } + }, { label: "负责人", name: "F_Manager", width: 100, align: "left" }, { label: "分管校长", name: "F_SchoolMasterId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -124,7 +133,8 @@ var bootstrap = function ($, learun) { callback(_data.name); } }); - }}, + } + }, //{ // label: "公告类别", name: "NoticeCategory", width: 200, align: "left" , // formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Controllers/ReportTemplateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Controllers/ReportTemplateController.cs index d0e1246b4..e75ab8052 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Controllers/ReportTemplateController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Controllers/ReportTemplateController.cs @@ -20,6 +20,7 @@ namespace Learun.Application.Web.Areas.LR_ReportModule.Controllers { private WfSchemeIBLL wfSchemeIBLL = new WfSchemeBLL(); private DataItemIBLL dataItemIBLL = new DataItemBLL(); + private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); #region 视图功能 /// /// 采购报表 @@ -66,6 +67,15 @@ namespace Learun.Application.Web.Areas.LR_ReportModule.Controllers { return View(); } + /// + /// 新版流程报表 + /// + /// + [HttpGet] + public ActionResult NWFSchemeReport() + { + return View(); + } #endregion #region 获取数据 @@ -121,20 +131,20 @@ namespace Learun.Application.Web.Areas.LR_ReportModule.Controllers { var usedata = wfSchemeIBLL.GetWfSchemeUseList(queryJson).ToList(); - var data = usedata.GroupBy(x => new { x.F_Category ,x.F_Code}).Select(x => new + var data = usedata.GroupBy(x => new { x.F_Category, x.F_Code }).Select(x => new { - category=x.Key.F_Category, - code=x.Key.F_Code, + category = x.Key.F_Category, + code = x.Key.F_Code, name = x.Select(y => y.F_Name).FirstOrDefault(), - kind=x.Select(y => y.F_Kind).FirstOrDefault(), + kind = x.Select(y => y.F_Kind).FirstOrDefault(), total = x.Select(y => y.F_Id).Count() - }).OrderByDescending(m=>m.total).ToList(); + }).OrderByDescending(m => m.total).ToList(); return JsonResult(data); } - + /// - /// 获取图表数据 + /// 获取流程报表图表数据 /// /// /// @@ -210,6 +220,104 @@ namespace Learun.Application.Web.Areas.LR_ReportModule.Controllers return Success(jsonData); } + /// + /// 获取新版流程报表数据 + /// + /// + [HttpGet] + public ActionResult GetNWFSchemeReportList(string queryJson) + { + var usedata = nWFSchemeIBLL.GetNWFSchemeUseList(queryJson).ToList(); + + var data = usedata.GroupBy(x => new { x.F_Category, x.F_Code, x.F_Name }).Select(x => new + { + category = x.Key.F_Category, + code = x.Key.F_Code, + name = x.Key.F_Name, + kind = x.Select(y => y.F_Kind).FirstOrDefault(), + total = x.Where(y => !string.IsNullOrEmpty(y.F_ProcessId)).Count() + }).OrderByDescending(m => m.total).ToList(); + + return JsonResult(data); + } + + /// + /// 获取新版流程报表图表数据 + /// + /// + /// + public ActionResult GetNWFSchemeUseList(string queryJson) + { + var categorydata = dataItemIBLL.GetDetailList("FlowSort"); + var usedata = nWFSchemeIBLL.GetNWFSchemeUseList(queryJson).ToList(); + + var aa = usedata.GroupBy(x => x.F_Category).Select(x => new WfSchemeReportModelOfPie() + { + name = x.Key, + value = x.Where(y => !string.IsNullOrEmpty(y.F_ProcessId)).Count() + }); + var bb = usedata.Where(x => x.F_CreateDate.HasValue).GroupBy(x => new { x.F_Category, x.F_CreateDate.Value.Month }).Select(x => new + { + name = x.Key.F_Category, + month = x.Key.Month, + value = x.Select(y => y.F_ProcessId).Count() + }); + + var legendData = new List(); + var seriesData = new List(); + var seriesLineData = new List(); + var xAxis = new List(); + for (int i = 0; i < 12; i++) + { + xAxis.Add(string.Format("{0}月", i + 1)); + } + foreach (var category in categorydata) + { + //饼图项 + legendData.Add(category.F_ItemName); + //饼图数据 + var model = new WfSchemeReportModelOfPie() + { + value = aa.FirstOrDefault(x => x.name == category.F_ItemValue) == null ? 0 : aa.FirstOrDefault(x => x.name == category.F_ItemValue).value, + name = category.F_ItemName + }; + seriesData.Add(model); + //折线图数据 + var monthData = new List(); + for (int i = 0; i < 12; i++) + { + monthData.Add(0); + } + var linemodel = new WfSchemeReportModelOfLine() + { + name = category.F_ItemName, + type = "line", + stack = "次数", + data = monthData + }; + var bbb = bb.Where(x => x.name == category.F_ItemValue); + if (bbb.Any()) + { + foreach (var bbbb in bbb) + { + linemodel.data[bbbb.month - 1] = bbbb.value; + } + } + + seriesLineData.Add(linemodel); + } + + var jsonData = new + { + legendData = legendData, + seriesData = seriesData, + seriesLineData = seriesLineData, + xAxis = xAxis + }; + + return Success(jsonData); + } + #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.cshtml new file mode 100644 index 000000000..555dcbbc0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.cshtml @@ -0,0 +1,40 @@ + +@{ + ViewBag.Title = "流程使用报表"; + Layout = "~/Views/Shared/_ReportTemplate.cshtml"; +} + +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    +  刷新 +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@Html.AppendJsFile("/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js new file mode 100644 index 000000000..8e7beb60f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js @@ -0,0 +1,144 @@ +var bootstrap = function ($, learun) { + "use strict"; + var year = ""; + var page = { + init: function () { + page.bind(); + page.initGrid(); + page.initChart(); + }, + bind: function () { + //当前年 + var now = learun.formatDate(new Date(), 'yyyy'); + $('#year').val(now); + year = now; + // 刷新 + $('#lr-replace').on('click', function () { + location.reload(); + }); + //查询 + $('#btn_Search').on('click', function () { + year = $('#year').val(); + page.search(); + }); + }, + initGrid: function () { + $(".lr-layout-grid").height($(window).height() - 110); + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_ReportModule/ReportTemplate/GetNWFSchemeReportList', + headData: [ + { name: "code", label: "编号", width: 200, align: "left" }, + { name: "name", label: "名称", width: 200, align: "left" }, + { + name: "category", label: "分类", width: 100, align: "center", + formatterAsync: function (callback, value, row) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'FlowSort', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + name: "kind", label: "类型", width: 100, align: "center", + formatter: function (cellvalue, row) { + if (cellvalue == 0) { + return '系统流程'; + } else { + return '自定义流程'; + } + } + }, + { name: "total", label: "次数", width: 200, align: "center", statistics: true } + ] + }); + page.search(); + }, + initChart: function () { + var myChart1 = echarts.init(document.getElementById('main')); + var myChart2 = echarts.init(document.getElementById('main1')); + var queryJson = { year: year }; + learun.httpAsyncPost(top.$.rootUrl + "/LR_ReportModule/ReportTemplate/GetNWFSchemeUseList", { queryJson: JSON.stringify(queryJson) }, function (res) { + if (res.code == 200) { + var option1 = { + title: { + text: year + '年流程使用分析图', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
    {b} : {c}次 ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.legendData + }, + series: [ + { + name: '流程分类', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.seriesData, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + myChart1.setOption(option1); + + var option2 = { + title: { + text: year + '年流程使用趋势图', + x: 'center' + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.legendData + }, + tooltip: { + trigger: 'axis' + }, + grid: { + left: '15%', + right: '3%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: res.data.xAxis + }, + yAxis: { + type: 'value', + name: '次数' + + }, + series: res.data.seriesLineData + }; + myChart2.setOption(option2); + } + }); + + }, + search: function (param) { + param = param || {}; + param.year = year; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + page.initChart(); + } + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs index e5d471f8a..1338f1914 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs @@ -28,6 +28,11 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers { return View(); } + [HttpGet] + public ActionResult ApiIndex() + { + return View(); + } /// /// 清空 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml index 250b7b699..e765d5c7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml @@ -15,6 +15,10 @@
    编号*
    +
    +
    标准编码*
    + +
    排序*
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.js index e0521df64..53d8caa77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.js @@ -6,13 +6,13 @@ * 描 述：分类管理 */ var parentId = request('parentId'); -var selectedRow = top.layer_ClassifyIndex.selectedRow; +//var selectedRow = top.layer_ClassifyIndex.selectedRow; var keyValue = ''; var acceptClick; var bootstrap = function ($, learun) { "use strict"; - + var selectedRow = learun.frameTab.currentIframe().selectedRow; var page = { init: function () { page.bind(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js index 6570ff19d..55ab8e34e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js @@ -71,9 +71,12 @@ var bootstrap = function ($, learun) { }); }, initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetClassifyList', headData: [ + { + label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left' + }, { label: '名称', name: 'F_ItemName', width: 200, align: 'left' }, { label: '编号', name: 'F_ItemCode', width: 200, align: 'left' }, { label: '排序', name: 'F_SortCode', width: 50, align: 'center' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml index 7529c1dfb..28fc9461c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml @@ -12,6 +12,10 @@
    项目值*
    +
    +
    标准编码*
    + +
    排序*
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js index 06a97743c..6da6953f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js @@ -105,9 +105,12 @@ var bootstrap = function ($, learun) { }); }, initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList', headData: [ + { + label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left' + }, { label: '项目名', name: 'F_ItemName', width: 200, align: 'left' }, { label: '项目值', name: 'F_ItemValue', width: 200, align: 'left' }, { label: '简拼', name: 'F_SimpleSpelling', width: 150, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.cshtml new file mode 100644 index 000000000..83d6882e4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.cshtml @@ -0,0 +1,35 @@ +@{ + ViewBag.Title = "日志管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    + +
    +
    +  导出 +
    +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/LR_SystemModule/Views/Log/ApiIndex.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.js new file mode 100644 index 000000000..994025e9a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/ApiIndex.js @@ -0,0 +1,93 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：陈彬彬 + * 日 期：2017.03.22 + * 描 述：日志管理 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '999'; + var logbegin = ''; + var logend = ''; + + var refreshGirdData = function () { + page.search(); + } + + var page = { + init: function () { + page.initGrid(); + page.bind(); + }, + bind: function () { + $('.datetime').each(function () { + $(this).lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + }); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + initGrid: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_SystemModule/Log/GetPageList', + headData: [ + { + label: "操作时间", name: "F_OperateTime",width: 135, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); + } + }, + { label: "操作接口", name: "F_SourceObjectId",width: 140, align: "left" }, + { label: "执行结果描述", name: "F_SourceContentJson", width: 300, align: "left" } + + ], + mainId: 'F_LogId', + isPage: true, + sidx: 'F_OperateTime' + }); + }, + search: function (param) { + param = param || {}; + param.CategoryId = categoryId; + param.StartTime = logbegin; + param.EndTime = logend; + + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml index b074ad26b..0c2d00e1a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml @@ -13,6 +13,9 @@
    +
    +  在线会话监控 +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js index 266c69772..c21750b10 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js @@ -19,6 +19,18 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + $('#lr_viewlog').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_OperateUserId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'online', + title: '访问监控', + url: top.$.rootUrl + '/Permission/Perm_FunctionVisit/IndexForCount?F_UserId='+keyValue, + height: 500, + width: 800 + }); + } + }); }, initGrid: function () { $('#gridtable').jfGrid({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js index 41086592b..2822a141c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js @@ -119,9 +119,9 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', key: value, - keyId: 'id', + keyId: 'f_departmentid', callback: function (_data) { - callback(_data['name']); + callback(_data['f_fullname']); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs index 0976f20ae..f78fa4972 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs @@ -28,6 +28,12 @@ namespace Learun.Application.Web.Areas.Permission.Controllers { return View(); } + + [HttpGet] + public ActionResult IndexForCount() + { + return View(); + } /// /// 表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.cshtml new file mode 100644 index 000000000..47b0af7d6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "统一认证访问日志"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.js new file mode 100644 index 000000000..8ff6a1a38 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_FunctionVisit/IndexForCount.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-07-09 10:45 + * 描 述：统一认证访问日志 + */ +var refreshGirdData; +var F_UserId = request("F_UserId"); +var bootstrap = function ($, learun) { + + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/Permission/Perm_FunctionVisit/GetPageList', + headData: [ + { label: "系统名称", name: "FName", width: 200, align: "left" }, + { label: "访问日期", name: "PDate", width: 150, align: "left" }, + { + label: "是否成功", name: "PIsLoginSuccess", width: 70, align: "center", formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + }, + { label: "用户名称", name: "PUName", width: 100, align: "left" }, + { label: "访问情况", name: "PContent", width: 200, align: "left" }, + ], + mainId: 'PVId', + isPage: true, + sidx:'PDate desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.F_UserId = F_UserId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs index 9ada6b114..87c88b9d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs @@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } #endregion @@ -61,6 +61,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers }; return Success(jsonData); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList() + { + var data = conferenceRoomIBLL.GetList(); + return Success(data); + } /// /// 获取表单数据 /// @@ -69,8 +82,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity( keyValue ); - var jsonData = new { + var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity(keyValue); + var jsonData = new + { ConferenceRoom = ConferenceRoomData, }; return Success(jsonData); @@ -102,9 +116,21 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { ConferenceRoomEntity entity = strEntity.ToObject(); - conferenceRoomIBLL.SaveEntity(keyValue,entity); + conferenceRoomIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + /// + /// 启用禁用实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoEnable(string keyValue, string status) + { + conferenceRoomIBLL.DoEnable(keyValue, status); + return Success("操作成功！"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs index 72419ab5a..590a8783e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs @@ -3,21 +3,22 @@ using System.Data; using Learun.Application.TwoDevelopment.PersonnelManagement; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementController : MvcControllerBase { private MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL(); - #region 视图功能 + #region 视图功能 /// /// 主页面 @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,15 +36,43 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); + } + /// + /// 表单页-查看 + /// + /// + [HttpGet] + public ActionResult FormView() + { + return View(); + } + /// + /// 主页面-我申请的会议 + /// + /// + [HttpGet] + public ActionResult IndexOfMyApply() + { + return View(); + } + /// + /// 主页面-我申请的会议 + /// + /// + [HttpGet] + public ActionResult IndexOfMyJoin() + { + return View(); } #endregion - #region 获取数据 + #region 获取数据 /// - /// 获取页面显示列表数据 + /// 获取页面显示列表分页数据 /// + /// 分页参数 /// 查询参数 /// [HttpGet] @@ -62,6 +91,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success(jsonData); } /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingManagementIBLL.GetList(queryJson); + return Success(data); + } + /// /// 获取表单数据 /// /// @@ -69,15 +110,31 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity( keyValue ); - var jsonData = new { + var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity(keyValue); + var jsonData = new + { + MeetingManagement = MeetingManagementData, + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormDataByProcessId(string processId) + { + var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntityByProcessId(processId); + var jsonData = new + { MeetingManagement = MeetingManagementData, }; return Success(jsonData); } #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -101,10 +158,41 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { + UserInfo userInfo = LoginUserInfo.Get(); MeetingManagementEntity entity = strEntity.ToObject(); - meetingManagementIBLL.SaveEntity(keyValue,entity); + entity.CreateUser = userInfo.userId; + entity.CreateTime = DateTime.Now; + entity.CheckStatus = "0"; + meetingManagementIBLL.SaveEntity(userInfo, keyValue, entity); return Success("保存成功！"); } + + /// + /// 审核实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoCheck(string keyValue, string status) + { + UserInfo userInfo = LoginUserInfo.Get(); + meetingManagementIBLL.DoCheck(userInfo, keyValue, status); + return Success("操作成功！"); + } + + /// + /// 提交实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoSubmit(string keyValue, string status, string processId) + { + meetingManagementIBLL.DoSubmit(keyValue, status, processId); + return Success("操作成功！"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs new file mode 100644 index 000000000..75c234822 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs @@ -0,0 +1,128 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesController : MvcControllerBase + { + private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingMinutesIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingMinutesIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue ); + var jsonData = new { + MeetingMinutes = MeetingMinutesData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingMinutesIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); + MeetingMinutesEntity entity = strEntity.ToObject(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = userInfo.userId; + meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs new file mode 100644 index 000000000..4a6d2da67 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs @@ -0,0 +1,128 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeController : MvcControllerBase + { + private MeetingNoticeIBLL meetingNoticeIBLL = new MeetingNoticeBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingNoticeIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingNoticeIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingNoticeData = meetingNoticeIBLL.GetMeetingNoticeEntity( keyValue ); + var jsonData = new { + MeetingNotice = MeetingNoticeData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingNoticeIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); + MeetingNoticeEntity entity = strEntity.ToObject(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = userInfo.userId; + meetingNoticeIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs new file mode 100644 index 000000000..f899ed8c9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs @@ -0,0 +1,138 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordController : MvcControllerBase + { + private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingSignInRecordIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingSignInRecordIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity(keyValue); + var jsonData = new + { + MeetingSignInRecord = MeetingSignInRecordData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingSignInRecordIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); MeetingSignInRecordEntity entity = strEntity.ToObject(); + meetingSignInRecordIBLL.SaveEntity(userInfo, keyValue, entity); + return Success("保存成功！"); + } + + /// + /// 签到实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoSignIn(string keyValue, bool isSignIn) + { + meetingSignInRecordIBLL.DoSignIn(keyValue, isSignIn); + return Success("操作成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml index a3fb208a8..1681fddb8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml @@ -3,25 +3,29 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    -
    名称
    - +
    +
    场地名称*
    +
    -
    -
    地点
    - +
    +
    地点*
    +
    -
    +
    状态
    - +
    -
    +
    可容纳人数
    - +
    -
    +
    备注
    - + +
    +
    +
    添加时间*
    +
    @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js index b15f2bae5..a120d0a51 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $("#Status").lrDataItemSelect({ code: 'EnableStatus' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml index 567b03b95..9fdbd0799 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml @@ -11,12 +11,12 @@
    -
    名称
    +
    场地名称
    状态
    - +
    @@ -31,6 +31,10 @@  修改  删除
    +
    +  启用 +  禁用 +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js index 6a78a0faf..e7eac8a91 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js @@ -16,18 +16,19 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $("#Status").lrDataItemSelect({ code: 'EnableStatus' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form', - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -41,8 +42,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form?keyValue=' + keyValue, - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -53,9 +54,45 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 启用 + $('#lr_enable').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status == "1") { + learun.alert.warning("当前项已启用！"); + return false; + } + learun.layerConfirm('是否确认启用该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "1" }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 禁用 + $('#lr_disable').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "1") { + learun.alert.warning("当前项未启用！"); + return false; + } + learun.layerConfirm('是否确认禁用该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "0" }, function () { refreshGirdData(); }); } @@ -68,20 +105,25 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetPageList', headData: [ - { label: "名称", name: "Name", width: 100, align: "left"}, - { label: "地点", name: "Address", width: 100, align: "left"}, - { label: "状态", name: "Status", width: 100, align: "left"}, - { label: "可容纳人数", name: "Scale", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { label: "场地名称", name: "Name", width: 200, align: "left" }, + { label: "地点", name: "Address", width: 200, align: "left" }, + { + label: "状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == 1 ? "启用" : "禁用"; + } + }, + { label: "可容纳人数", name: "Scale", width: 100, align: "left" }, + { label: "添加时间", name: "CreateTime", width: 100, align: "left" }, ], - mainId:'ID', - isPage: true + mainId: 'ID', + isPage: true, + sidx: 'CreateTime desc' }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index cb221f741..440d2ff88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js @@ -184,7 +184,7 @@ var bootstrap = function ($, learun) { label: "月份", name: "MPMonth", width: 100, align: "left" }, { - label: "部门", name: "MPDepartment", width: 250, align: "left", + label: "部门", name: "MPDepartment", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) { console.log(res); @@ -195,7 +195,7 @@ var bootstrap = function ($, learun) { } }, { - label: "接收人", name: "MPReceiveUser", width: 250, align: "left", + label: "接收人", name: "MPReceiveUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) { if (res.code == learun.httpCode.success) { @@ -204,7 +204,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "名称", name: "MPProjectName", width: 100, align: "left" }, + { label: "名称", name: "MPProjectName", width: 200, align: "left" }, { label: "上传文件", name: "MPFileTwo", @@ -216,7 +216,6 @@ var bootstrap = function ($, learun) { data: { folderId: value }, type: 'GET', dataType: "json", - async: false, cache: false, success: function (res) { var bb = ''; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml index c7d673dda..949b5ee1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml @@ -1,31 +1,55 @@ @{ - ViewBag.Title = "会议室管理"; + ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    -
    会议室*
    - +
    +
    会议主题*
    +
    -
    -
    预约时间*
    - +
    +
    校内参入人员*
    +
    -
    -
    使用时间
    - +
    +
    校外参入人员
    +
    -
    -
    纪要记录人
    - +
    +
    会议场地*
    +
    -
    -
    会议纪要
    - +
    +
    会议开始时间*
    +
    -
    -
    附件
    -
    +
    +
    会议结束时间*
    + +
    +
    +
    会议记录者
    +
    +
    +
    +
    会议内容*
    + +
    + @*
    +
    会议内容*
    +
    +
    *@ + @*
    +
    附件上传
    +
    +
    *@ +
    +
    联系人*
    + +
    +
    +
    联系电话*
    +
    @Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js index 7b69ecedb..469b7203c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js @@ -1,13 +1,41 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 - * 日 期：2020-03-23 15:04 - * 描 述：会议室管理 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 */ var acceptClick; var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; + var bootstrap = function ($, learun) { "use strict"; + // 设置权限 + setAuthorize = function (data) { + if (!!data) { + for (var field in data) { + if (data[field].isLook != 1) {// 如果没有查看权限就直接移除 + $('#' + data[field].fieldId).parent().remove(); + } + else { + if (data[field].isEdit != 1) { + $('#' + data[field].fieldId).attr('disabled', 'disabled'); + if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) { + $('#' + data[field].fieldId).css({ 'padding-right': '58px' }); + $('#' + data[field].fieldId).find('.btn-success').remove(); + } + } + } + } + } + }; var page = { init: function () { $('.lr-form-wrap').lrscroll(); @@ -15,7 +43,16 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Files').lrUploader(); + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#RecordPerson').lrUserSelect(0); + //var ContentUE = UE.getEditor('Content'); + //$('#Content')[0].ue = ContentUE; $('#Files').lrUploader(); + $('#InternalParticipants').lrUserSelect(1); }, initData: function () { if (!!keyValue) { @@ -32,18 +69,45 @@ var bootstrap = function ($, learun) { } } }; - // 保存数据 - acceptClick = function (callBack) { + // 设置表单数据 + setFormData = function (processId, param, callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + if (id == 'MeetingManagement' && data[id]) { + keyValue = data[id].Id; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); + } + // 验证数据是否填写完整 + validForm = function () { if (!$('body').lrValidform()) { return false; } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + if (!!processId) { + formData.ProcessId = processId; + } var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) + strEntity: JSON.stringify(formData) }; $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml new file mode 100644 index 000000000..cc6d59681 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml @@ -0,0 +1,52 @@ +@{ + ViewBag.Title = "会议管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
    +
    +
    会议主题*
    + +
    +
    +
    校内参入人员*
    +
    +
    +
    +
    校外参入人员
    + +
    +
    +
    会议场地*
    +
    +
    +
    +
    会议开始时间*
    + +
    +
    +
    会议结束时间*
    + +
    +
    +
    会议记录者
    +
    +
    +
    +
    会议内容*
    + +
    +
    +
    联系人*
    + +
    +
    +
    联系电话*
    + +
    +
    +
    扫码签到
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js new file mode 100644 index 000000000..5e536ad42 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js @@ -0,0 +1,123 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; + +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + if (!!data) { + for (var field in data) { + if (data[field].isLook != 1) {// 如果没有查看权限就直接移除 + $('#' + data[field].fieldId).parent().remove(); + } + else { + if (data[field].isEdit != 1) { + $('#' + data[field].fieldId).attr('disabled', 'disabled'); + if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) { + $('#' + data[field].fieldId).css({ 'padding-right': '58px' }); + $('#' + data[field].fieldId).find('.btn-success').remove(); + } + } + } + } + } + }; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#RecordPerson').lrUserSelect(0); + $('#InternalParticipants').lrUserSelect(1); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + //扫码签到 + makeCode(data[id].Id); + } + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId, param, callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + if (id == 'MeetingManagement' && data[id]) { + keyValue = data[id].Id; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); + } + // 验证数据是否填写完整 + validForm = function () { + if (!$('body').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + if (!!processId) { + formData.ProcessId = processId; + } + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, i); + } + }); + }; + page.init(); +} +//扫码签到 +var qrcode = new QRCode(document.getElementById("qrCode"), { + width: 150, + height: 150 + }); +function makeCode(urls) { + qrcode.makeCode(urls); + } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml index 741b46d2e..3cb8f5afb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml @@ -1,8 +1,10 @@ @{ - ViewBag.Title = "会议室管理"; + /**/ + + ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Index.cshtml"; } -
    +
    @@ -11,8 +13,16 @@
    -
    会议室
    - +
    会议主题
    + +
    +
    +
    会议场地
    +
    +
    +
    +
    申请人
    +
    @@ -23,9 +33,18 @@
    -  新增 -  编辑 +  新增 +  编辑  删除 +  查看 +  提交 +
    +
    +  考勤 +  纪要 +  通知 +  审核通过 +  审核不通过
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js index 7b591c468..1b96ced65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js @@ -1,12 +1,13 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 - * 日 期：2020-03-23 15:04 - * 描 述：会议室管理 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 */ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var processId = ''; var page = { init: function () { page.initGird(); @@ -16,20 +17,36 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#CreateUser').lrUserSelect(0); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', + learun.layerForm({ + id: 'addform', title: '新增', url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form', - width: 600, - height: 400, + width: 1000, + height: 800, callBack: function (id) { - return top[id].acceptClick(refreshGirdData); + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; } }); }); @@ -37,14 +54,31 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } learun.layerForm({ - id: 'form', + id: 'editform', title: '编辑', url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue, - width: 600, - height: 400, + width: 1000, + height: 800, callBack: function (id) { - return top[id].acceptClick(refreshGirdData); + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; } }); } @@ -53,9 +87,115 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已审核或审核中！"); + return false; + } + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '查看会议工作', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + //提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + // 考勤 + // 纪要 + $('#lr_minutes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingMinutesIndex', + title: '会议纪要', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn:null + }); + } + }); + // 通知 + $('#lr_notice').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingNoticeIndex', + title: '会议通知', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + // 审核通过 + $('#lr_checkyes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '1') { + learun.alert.warning("该项已审核通过！"); + return false; + } + learun.layerConfirm('是否确认审核通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 审核不通过 + $('#lr_checkno').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '2') { + learun.alert.warning("该项已审核不通过！"); + return false; + } + learun.layerConfirm('是否确认审核不通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () { refreshGirdData(); }); } @@ -68,24 +208,81 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList', headData: [ - { label: "会议室", name: "MeetingName", width: 100, align: "left"}, - { label: "预约时间", name: "OrderTime", width: 130, align: "left"}, - { label: "使用时间", name: "UseTime", width: 130, align: "left"}, - { label: "纪要记录人", name: "RecordPerson", width: 100, align: "left"}, - { label: "会议纪要", name: "Content", width: 100, align: "left"}, - { label: "附件", name: "Files", width: 100, align: "left"}, + { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" }, + { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" }, + { label: "开始时间", name: "BeginTime", width: 120, align: "left" }, + { label: "结束时间", name: "EndTime", width: 120, align: "left" }, + { + label: "会议记录者", name: "RecordPerson", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "联系人", name: "Linkman", width: 100, align: "left" }, + { label: "联系电话", name: "LinkPhone", width: 100, align: "left" }, + { + label: "申请人", name: "CreateUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "申请时间", name: "CreateTime", width: 120, align: "left" }, + { + label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已通过" : cellvalue == "2" ? "未通过" : cellvalue == "3" ? "审核中" : "未审核"; + } + }, + { + label: "审核人", name: "CheckUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + //callback(_data.name); + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name); + } + }); + } + }, + { + label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) { + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value; + } + }, ], - mainId:'Id', - isPage: true + mainId: 'Id', + isPage: true, + sidx: 'CreateTime desc' }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; - refreshGirdData = function () { + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } page.search(); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml new file mode 100644 index 000000000..baa5705a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml @@ -0,0 +1,55 @@ +@{ + /**/ + + ViewBag.Title = "会议管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    会议主题
    + +
    +
    +
    会议场地
    +
    +
    +
    +
    申请人
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  查看 +  提交 +
    +
    +  考勤 +  纪要 +  通知 +  审核通过 +  审核不通过 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js new file mode 100644 index 000000000..9be3e8340 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js @@ -0,0 +1,264 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#CreateUser').lrUserSelect(0); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'addform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form', + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerForm({ + id: 'editform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue, + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已审核或审核中！"); + return false; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '查看会议工作', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + //提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + // 考勤 + // 纪要 + // 通知 + // 审核通过 + $('#lr_checkyes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '1') { + learun.alert.warning("该项已审核通过！"); + return false; + } + learun.layerConfirm('是否确认审核通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 审核不通过 + $('#lr_checkno').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '2') { + learun.alert.warning("该项已审核不通过！"); + return false; + } + learun.layerConfirm('是否确认审核不通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList', + headData: [ + { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" }, + { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" }, + { label: "开始时间", name: "BeginTime", width: 120, align: "left" }, + { label: "结束时间", name: "EndTime", width: 120, align: "left" }, + { + label: "会议记录者", name: "RecordPerson", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "联系人", name: "Linkman", width: 100, align: "left" }, + { label: "联系电话", name: "LinkPhone", width: 100, align: "left" }, + { + label: "申请人", name: "CreateUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "申请时间", name: "CreateTime", width: 120, align: "left" }, + { + label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已通过" : cellvalue == "2" ? "未通过" : cellvalue == "3" ? "审核中" : "未审核"; + } + }, + { + label: "审核人", name: "CheckUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + //callback(_data.name); + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name); + } + }); + } + }, + { + label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) { + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value; + } + }, + ], + mainId: 'Id', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.CreateUser = learun.clientdata.get(['userinfo']).userId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml new file mode 100644 index 000000000..c8488f576 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml @@ -0,0 +1,55 @@ +@{ + /**/ + + ViewBag.Title = "会议管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    会议主题
    + +
    +
    +
    会议场地
    +
    +
    +
    +
    申请人
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  查看 +  提交 +
    +
    +  考勤 +  纪要 +  通知 +  审核通过 +  审核不通过 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js new file mode 100644 index 000000000..948a840f0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js @@ -0,0 +1,264 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#CreateUser').lrUserSelect(0); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'addform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form', + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerForm({ + id: 'editform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue, + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已审核或审核中！"); + return false; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '查看会议工作', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + //提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + // 考勤 + // 纪要 + // 通知 + // 审核通过 + $('#lr_checkyes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '1') { + learun.alert.warning("该项已审核通过！"); + return false; + } + learun.layerConfirm('是否确认审核通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 审核不通过 + $('#lr_checkno').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '2') { + learun.alert.warning("该项已审核不通过！"); + return false; + } + learun.layerConfirm('是否确认审核不通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList', + headData: [ + { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" }, + { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" }, + { label: "开始时间", name: "BeginTime", width: 120, align: "left" }, + { label: "结束时间", name: "EndTime", width: 120, align: "left" }, + { + label: "会议记录者", name: "RecordPerson", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "联系人", name: "Linkman", width: 100, align: "left" }, + { label: "联系电话", name: "LinkPhone", width: 100, align: "left" }, + { + label: "申请人", name: "CreateUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "申请时间", name: "CreateTime", width: 120, align: "left" }, + { + label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已通过" : cellvalue == "2" ? "未通过" : cellvalue == "3" ? "审核中" : "未审核"; + } + }, + { + label: "审核人", name: "CheckUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + //callback(_data.name); + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name); + } + }); + } + }, + { + label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) { + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value; + } + }, + ], + mainId: 'Id', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.InternalParticipants = learun.clientdata.get(['userinfo']).userId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml new file mode 100644 index 000000000..b8d27e31a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml @@ -0,0 +1,19 @@ +@{ + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    纪要标题*
    + +
    +
    +
    纪要内容
    + +
    +
    +
    附件上传
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js new file mode 100644 index 000000000..cb8645f13 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var acceptClick; +var keyValue = request('keyValue'); +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#Files').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data.MeetID = MeetID; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml new file mode 100644 index 000000000..8ddb98ebc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml @@ -0,0 +1,43 @@ +@{ + /**/ + + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    会议名称
    + +
    +
    +
    纪要标题
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  打印 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js new file mode 100644 index 000000000..c107383eb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js @@ -0,0 +1,98 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var refreshGirdData; +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'MeetingMinutesform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingMinutesform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?keyValue=' + keyValue + '&MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetPageList', + headData: [ + { label: "会议", name: "MeetingTitle", width: 150, align: "left" }, + { label: "纪要标题", name: "Title", width: 150, align: "left" }, + { label: "内容", name: "Content", width: 150, align: "left" }, + { label: "创建时间", name: "CreateTime", width: 100, align: "left" }, + { label: "创建人", name: "CreateUser", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.MeetID = MeetID; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml new file mode 100644 index 000000000..655adb1a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "会议通知"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    通知标题*
    + +
    +
    +
    通知内容
    + +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js new file mode 100644 index 000000000..6b36f91e2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议通知 + */ +var acceptClick; +var keyValue = request('keyValue'); +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#Files').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data.MeetID = MeetID; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml new file mode 100644 index 000000000..120f309a3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml @@ -0,0 +1,43 @@ +@{ + /**/ + + ViewBag.Title = "会议通知"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    会议名称
    + +
    +
    +
    通知标题
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  打印 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js new file mode 100644 index 000000000..df6bb776b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js @@ -0,0 +1,98 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议通知 + */ +var refreshGirdData; +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'MeetingNoticeform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingNoticeform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?keyValue=' + keyValue + '&MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/GetPageList', + headData: [ + { label: "会议", name: "MeetingTitle", width: 150, align: "left" }, + { label: "通知标题", name: "Title", width: 150, align: "left" }, + { label: "内容", name: "Content", width: 150, align: "left" }, + { label: "创建时间", name: "CreateTime", width: 100, align: "left" }, + { label: "创建人", name: "CreateUser", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.MeetID = MeetID; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml new file mode 100644 index 000000000..594a2a948 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "会议签到记录"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    会议
    +
    +
    +
    +
    参与人id
    +
    +
    +
    +
    参与人名字
    + +
    +
    +
    是否签到
    +
    +
    +
    +
    参加时间
    + +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js new file mode 100644 index 000000000..0dbde9dd1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js @@ -0,0 +1,58 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:16 + * 描 述：会议签到记录 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#MeetID').lrDataItemSelect({ code: '' }); + $('#ParticipantID').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); + $('#IsSignIn').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml new file mode 100644 index 000000000..ec8e22990 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml @@ -0,0 +1,41 @@ +@{ + /**/ + + ViewBag.Title = "会议签到记录"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    会议
    + +
    +
    +
    用户
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  已签到 +  未签到 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js new file mode 100644 index 000000000..22d437003 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js @@ -0,0 +1,136 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:16 + * 描 述：会议签到记录 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //已签到 + $('#lr_signIn').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var IsSignIn = $('#gridtable').jfGridValue('IsSignIn'); + if (IsSignIn == true) { + learun.alert.warning("该项已签到！"); + return false; + } + learun.layerConfirm('是否确认签到！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DoSignIn', { keyValue: keyValue, isSignIn: true }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //未签到 + $('#lr_notSignIn').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var IsSignIn = $('#gridtable').jfGridValue('IsSignIn'); + if (IsSignIn != true) { + learun.alert.warning("该项未签到！"); + return false; + } + learun.layerConfirm('是否确认未签到！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DoSignIn', { keyValue: keyValue, isSignIn: false }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetPageList', + headData: [ + { label: "会议", name: "MeetingTitle", width: 150, align: "left" }, + { label: "用户", name: "ParticipantName", width: 100, align: "left" }, + { + label: "状态", name: "IsSignIn", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "已签到" : "未签到"; + } + }, + { label: "签到时间", name: "SignInTime", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'MeetID,ParticipantID' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml index a5a99d2ad..b28177bcb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml @@ -7,21 +7,25 @@
    教师姓名*
    -
    -
    资格种类
    -
    -
    -
    -
    任教学科*
    - +
    +
    证书名称*
    +
    -
    +
    证书编号*
    -
    +
    +
    资格种类
    +
    +
    +
    +
    任教学科
    + +
    +
    取得时间*
    - +
    @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js index f1dd57a33..94f26ecb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js @@ -16,11 +16,12 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' }); - $('#TCName').lrformselect({ - layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', - layerUrlW: 400, - layerUrlH: 300, - dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + $('#TCName').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml index 71998f003..b36e0db23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml @@ -7,8 +7,26 @@
    -
    + @*
    +
    *@ +
    +
    +
    +
    +
    教师姓名
    +
    +
    +
    +
    证书名称
    + +
    +
    +
    资格种类
    +
    +
    +
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js index 6174d3dae..2615111ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js @@ -15,6 +15,9 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); // 时间搜索框 $('#datesearch').lrdate({ dfdata: [ @@ -42,6 +45,14 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#TCName').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -101,14 +112,18 @@ var bootstrap = function ($, learun) { { label: "教师姓名", name: "TCName", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', key: value, + keyId: 'empid', callback: function (_data) { - callback(_data.name); + callback(_data['empname']); } }); } }, + { label: "证书名称", name: "TCType", width: 150, align: "left" }, + { label: "证书编号", name: "TCCode", width: 150, align: "left" }, { label: "资格种类", name: "TCTypeID", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -122,17 +137,18 @@ var bootstrap = function ($, learun) { } }, { label: "任教学科", name: "TCClass", width: 100, align: "left" }, - { label: "证书编号", name: "TCCode", width: 100, align: "left" }, { label: "取得时间", name: "TCTime", width: 100, align: "left" }, ], mainId: 'TCID', - isPage: true + isPage: true, + sidx:'TCTime desc' }); + page.search(); }, search: function (param) { param = param || {}; - param.StartTime = startTime; - param.EndTime = endTime; + //param.StartTime = startTime; + //param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css new file mode 100644 index 000000000..1a523dc77 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css @@ -0,0 +1,141 @@ +html,body{ + background: #EBF6FF; +} +body.active .header { + background-image: url(../../images/DragSSO/headBg2.jpg); +} +.header{ + background-image:url('../../images/DragSSO/headBg.jpg'); + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (src='../../images/DragSSO/headBg.jpg', sizingMethod='scale'); +} +.headNum{ + color: #198BE3; +} +.headModeTxt { + background: #50AAF1; +} + +.headModeList { + background-color: #0078D7; + -webkit-box-shadow: 0 5px 6px rgba(64, 172, 255, .4); + -moz-box-shadow: 0 5px 6px rgba(64, 172, 255, .4); + box-shadow: 0 5px 6px rgba(64, 172, 255, .4); +} +.headModeList li.active { + background-color: #036AC9; +} +.headTab li:after { + background: #67B7F7; +} +.inSec3HeadTab.active:after { + background-color: #198BE3; +} +.inSecLeftCon:hover { + background-color: #198BE3; + border-color: #198BE3; +} +.inSec1TabBox.active:after { + background-color: #198BE3; +} +.inSec1List1{ + background: #F3FAFF; +} +.inSec1List1 li.active,.inSec1List1 li:hover{ + background: #D8EEFF; + border-bottom-color: #D8EEFF; +} +.inSec1List1 li.active a,.inSec1List1 li:hover a{ + color: #198BE3; +} +.inSec1List1 li{ + border-bottom: 1px solid #e0edef; +} +.index_sec2 .inSec1T{ + background: #198BE3; +} +.inSec1List2 li.active,.inSec1List2 li:hover{ + background: #D8EEFF; +} +.aLeft:hover { + background-color: #D8EEFF; +} +.inSecT { + background-color: #198BE3; +} +.more { + background-color: #75B9EE; +} +.inSec3L { + background-color: #F2F9FF; +} +.workList li.active { + background-color: #D6EDFF; +} +.workList li { + border-bottom: 1px solid #E0F1FF; +} +.inSec3Num { + color: #2E96E6; +} +.inSec2TabBox.active:after { + background-color: #198BE3; +} +.inSec2L { + background-color: #F2F9FF; +} +.inSec2Llist i { + color: #2E96E6; +} +.inSec3WorkBtn { + background-color: #EAF5FF; + color: #198BE3; +} +.inSec3WorkBtn2 { + color: #198BE3; +} + +.inSec1Drag div:hover { + background-color: #D8EEFF; +} +.inSec2Llist li { + border-bottom: 1px solid #e0edef; +} +.inSec2Llist li.active, +.inSec2Llist li:hover { + background: #D8EEFF; + border-bottom-color: #D8EEFF; +} +.aRight:hover { + background-color: #D8EEFF; +} +.inSecShadow { + -webkit-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); +} + +/* search */ +.search { + background-color: #005190; +} +.searchLT { + color: #82C7FE; +} +.searchTop>span { + color: #63A7DF; +} +.searchTopList li.active, +.searchTopList li:hover { + background-color: #0F85E2; +} + +.searchRTop { + background-color: #003E83; + color: #81C7FE; +} +.headSearchClose { + border: 1px solid #1973B9; +} +.headSearchClose:hover { + background-color: #5EAEEB; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/common.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/common.css new file mode 100644 index 000000000..d539cc7f5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/common.css @@ -0,0 +1,77 @@ +@charset "utf-8"; +/* CSS Document */ +*{ + box-sizing: border-box; +} +body,html{ + font-size:14px; + font-family: "Microsoft YaHei", "微软雅黑" !important; + color: #424242; + min-width: 1680px; + margin: 0; + padding: 0; + height: 100%; +} +/*body{ overflow:hidden;} */ +ul{ + margin:0px; + padding:0px; + list-style:none; + } +li{ + list-style:none; + } +ul li a{ + display:block; + } + + +a{ + text-decoration:none; + color: #424242; + outline:none; + } +input{ + border:1px solid #ccc; + outline:none; + } +textarea{ + border:1px solid #ccc; + outline:none; + } +form{ + margin:0px; + padding:0px; + } +table{ + cellspacing:0px; + cellpadding:0px; + } +img{ + border:none; + } +a,img{border:0;} +.clear{ + clear:both; + } +.clearfix{ + *zoom:1; +} +.clearfix:after{ + content: ''; + display: block; + clear: both; +} + +a{outline:none !important;} + +img{border:0 none;} + +::selection { + background: #000; + color: #fff; +} +.warpper *::-webkit-scrollbar-track-piece{width:1px;background-color:#fff;} +.warpper *::-webkit-scrollbar{width:1px;height:1px} +.warpper *::-webkit-scrollbar-thumb{height:10px;background-color:#ccc;} +.warpper *::-webkit-scrollbar-thumb:hover{background:#ccc;} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/green.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/green.css new file mode 100644 index 000000000..6e7fcf019 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/green.css @@ -0,0 +1,137 @@ +html,body{ + background: #EDFEF7; +} +.header{ + background-image:url('../../images/DragSSO/headBg-green.jpg'); + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (src='../../images/DragSSO/headBg-green.jpg', sizingMethod='scale'); +} +.headNum{ + color: #01A566; +} +.inSec1List1{ + background: #F7FFFC; +} +.inSec1List1 li.active,.inSec1List1 li:hover{ + background: #D5F4E9; + border-bottom-color: #D5F4E9; +} +.inSec1List1 li.active a,.inSec1List1 li:hover a{ + color: #01A566; +} +.inSec1List1 li{ + border-bottom: 1px solid #E7F8F2; +} +.headModeTxt { + background: #03c178; +} + +.headModeList { + background-color: #03c178; + -webkit-box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); + box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); +} +.headModeList li.active { + background-color: #01A566; +} +.headTab li:after { + background: #67C9A3; +} +.inSec3HeadTab.active:after { + background-color: #01A566; +} +.inSecLeftCon:hover { + background-color: #01A566; + border-color: #01A566; +} +.inSec1TabBox.active:after { + background-color: #01A566; +} +.index_sec2 .inSec1T{ + background: #01A566; +} +.inSec1List2 li.active,.inSec1List2 li:hover{ + background: #D5F4E9; +} +.aLeft:hover { + background-color: #D5F4E9; +} +.inSecT { + background-color: #01A566; +} +.more { + background-color: #67C9A3; +} +.inSec3L { + background-color: #F7FFFC; +} +.workList li.active { + background-color: #D5F4E9; +} +.workList li { + border-bottom: 1px solid #E7F8F2; +} +.inSec3Num { + color: #01A566; +} +.inSec2TabBox.active:after { + background-color: #01A566; +} +.inSec2L { + background-color: #F7FFFC; +} +.inSec2Llist i { + color: #01A566; +} +.inSec3WorkBtn { + background-color: #F7FFFC; + color: #01A566; +} +.inSec3WorkBtn2 { + color: #01A566; +} + +.inSec1Drag div:hover { + background-color: #D5F4E9; +} +.inSec2Llist li { + border-bottom: 1px solid #E7F8F2; +} +.inSec2Llist li.active, +.inSec2Llist li:hover { + background: #D5F4E9; + border-bottom-color: #D5F4E9; +} +.aRight:hover { + background-color: #D5F4E9; +} +.inSecShadow{ + -webkit-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); +} +/* search */ +.search { + background-color: #00482c; +} +.searchLT { + color: #018e57; +} +.searchTop>span { + color: #018e57; +} +.searchTopList li.active, +.searchTopList li:hover { + background-color: #01A566; +} + +.searchRTop { + background-color: #00331f; + color: #018e57; +} +.headSearchClose { + border: 1px solid #03c178; +} +.headSearchClose:hover { + background-color: #03c178; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css new file mode 100644 index 000000000..2bab40735 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css @@ -0,0 +1,2592 @@ +@charset "utf-8"; +/* CSS Document */ + +/*****header*******/ +.header { + height: 70px; + position: relative; + background-size: 100% 100%; + -moz-background-size: 100% 100%; + -webkit-background-size: 100% 100%; + -o-background-size: 100% 100%; + padding: 0 30px; +} + +body.active .header { + z-index: 9999; + /* background-image: url(../images/headBg2.jpg); */ +} + +.headLogin { + width: 70px; + height: 30px; + text-align: center; + line-height: 30px; + background: #fff; + border-radius: 15px; + font-size: 14px; + /* margin-left: 25px; */ + /*display: none !important;*/ +} + +/*.noLoginType .headLogin { + display: inline-block !important; +}*/ + +.noLoginType .loginAfter { + display: none; +} + +.noLoginType .logins { + display: block; +} + +.headLine2 { + height: 100%; + width: 1px; +} + +.headLogo { + float: left; + font-size: 22px; + color: #fff; + line-height: 70px; + font-weight: bold; +} + + .headLogo:hover { + color: #fff; + } + + .headLogo span { + display: inline-block; + background-color: #40ACFF; + padding: 0 10px; + line-height: 26px; + font-size: 12px; + margin-left: 5px; + border-radius: 3px; + position: relative; + top: -3px; + } + +.headTab { + float: left; + overflow: hidden; + margin-left: 20px; + height: 100%; +} + + .headTab li { + float: left; + height: 100%; + width: 70px; + text-align: center; + line-height: 0; + position: relative; + } + + .headTab li:after { + content: ""; + width: 100%; + height: 5px; + position: absolute; + left: 0; + bottom: 0; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + /* background: #67B7F7; */ + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + } + + .headTab a { + display: block; + height: 100%; + } + + .headTab img { + height: 28px; + margin-top: 21px; + filter: alpha(opacity=70); + -moz-opacity: .7; + -khtml-opacity: .7; + opacity: .7; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + } + + .headTab li.active:after, + .headTab li.active img, + .headTab li:hover:after, + .headTab li:hover img { + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + } + +.headTitle { + height: 28px; + margin-top: 21px; + line-height: 28px; + float: left; + font-weight: bold; + color: #fff; + font-size: 16px; + margin-left: 50px; +} + +.headSearch { + width: 255px; + height: 30px; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + margin: auto; + background: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#7Fffffff, endColorstr=#7Fffffff); + border-radius: 18px; +} + + .headSearch .headSearchImg { + height: 18px; + position: absolute; + top: 0; + bottom: 0; + left: 80px; + margin: auto; + line-height: 0; + text-align: center; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + } + +.headSearchImg img { + height: 16px; +} + +.headSearch input { + border: 0; + background: transparent; + height: 100%; + display: block; + width: 100%; + line-height: 24px; + padding: 6px 40px 6px 50px; + text-align: center; + font-size: 14px; + color: #fff; + transition: left .3s; + -moz-transition: left .3s; + -ms-transition: left .3s; + -o-transition: left .3s; + -webkit-transition: left .3s; +} + + .headSearch input::-webkit-input-placeholder { + color: #fff; + } + +.headSearchClose { + position: absolute; + height: 100%; + width: 84px; + top: 0; + left: 105%; + /* border: 1px solid #1973B9; */ + color: #fff; + text-align: center; + line-height: 28px; + border-radius: 15px; + cursor: pointer; + font-size: 12px; + display: none; + transition: all .3s; + -moz-transition: all .3s; + -ms-transition: all .3s; + -o-transition: all .3s; + -webkit-transition: all .3s; +} + +body.active .headSearch { + left: -490px; +} + +body.active .headSearchClose, +body.active .headSearchHistory { + display: block; +} + +body.active .headSearchImg { + left: 226px; +} + +.headSearchHistory { + position: absolute; + left: 10px; + top: 0; + width: 40px; + font-size: 12px; + color: #fff; + line-height: 30px; + display: none; +} + +.headSearchHistBox { +} + + .headSearchHistBox i { + } + + + +/* .headSearchClose:hover { + background-color: #5EAEEB; +} */ + +.headUser { + float: right; + padding: 8px 0; + height: 100%; +} + + .headUser > *, + .loginAfter > * { + display: inline-block; + vertical-align: middle; + } + +.loginAfter { + height: 100%; +} + +.skinBox { + position: relative; + cursor: pointer; + z-index: 9; + width: 27px; +} + + .skinBox > img { + height: 20px; + } + +.skin { + position: absolute; + z-index: 99; + top: 100%; + right: 100%; + width: 340px; + line-height: 20px; + transition: all .2s; + -moz-transition: all .2s; + -ms-transition: all .2s; + -o-transition: all .2s; + -webkit-transition: all .2s; + overflow: hidden; + background: #fff; + padding: 16px; + border-radius: 4px; + -ms-transform: scale(0, 0); + -ms-transform-origin: 100% 0; + -webkit-transform: scale(0, 0); + -webkit-transform-origin: 100% 0; + -moz-transform: scale(0, 0); + -moz-transform-origin: 100% 0; + -o-transform: scale(0, 0); + -o-transform-origin: 100% 0; + transform: scale(0, 0); + transform-origin: 100% 0; +} + +.skinBox.active .skin { + transform: scale(1, 1); +} + +.skinT { + line-height: 24px; +} + + .skinT img { + float: right; + width: 20px; + } + +.skinList { + overflow: hidden; +} + +.skins { + width: 33.333333%; + float: left; + padding: 4px 2px 0; +} + + .skins > div { + padding-bottom: 62.5%; + height: 0; + overflow: hidden; + position: relative; + } + + .skins > div > img { + width: 100%; + display: block; + } + +.blue > div { + background: #198BE3; +} + +.red > div { + background: #C42016; +} + +.green > div { + background: #01A566; +} + +.skinTxt { + position: absolute; + left: 0; + right: 0; + bottom: 0; + line-height: 20px; + text-align: center; + /* font-size: 12px; */ + color: #fff; +} + +.blue .skinTxt, +.blue .skinText { + background: #198BE3; +} + +.red .skinTxt, +.red .skinText { + background: #C42016; +} + +.green .skinTxt, +.green .skinText { + background: #01A566; +} + +.skinCheck { + height: 20px; + position: absolute; + left: 0; + right: 0; + top: 38%; + margin-top: -10px; + text-align: center; + line-height: 20px; + color: #fff; + font-size: 12px; + display: none; +} + +.skins.active .skinCheck { + display: block; +} + +.skinText { + height: 100%; + width: 100%; + position: absolute; + left: 0; + top: 100%; + transition: all .1s; + -moz-transition: all .1s; + -ms-transition: all .1s; + -o-transition: all .1s; + -webkit-transition: all .1s; + text-align: center; + color: #fff; + line-height: 60px; +} + +.skins.active:hover .skinText { + top: 100%; +} + +.skins:hover .skinText { + top: 0; +} + +.authorBox > * { + display: inline-block; + vertical-align: middle; + /* line-height: 0; */ +} + +.authorBox { + position: relative; +} + +.authorSetBox { + position: absolute; + width: 130px; + top: 120%; + left: 50%; + margin-left: -65px; + padding-top: 1px; + opacity: 0; + z-index: -1; + transition: all .3s; + -moz-transition: all .3s; + -ms-transition: all .3s; + -o-transition: all .3s; + -webkit-transition: all .3s; +} + +.authorBox:hover .authorSetBox { + opacity: 1; + top: 98%; + z-index: 1; +} + +.authorSetCon { + background-color: #fff; + position: relative; + text-align: center; + cursor: pointer; + margin-top: 9px; + border-radius: 2px; +} + + .authorSetCon::after { + content: ''; + position: absolute; + left: 36px; + top: -10px; + border: 5px solid transparent; + border-bottom-color: #fff; + } + +.auSetLi { + padding: 5px 0; +} + +.headUserImg { + height: 45px; + width: 45px; + border-radius: 50%; + line-height: 0; + overflow: hidden; + margin: 0 12px 0 0; +} + + .headUserImg img { + width: 100%; + } + +.headUserTxt { + font-size: 16px; + color: #fff; +} + +.headLine1 { + width: 1px; + height: 100%; + background: #fff; + filter: alpha(opacity=30); + -moz-opacity: .3; + -khtml-opacity: .3; + opacity: .3; + margin: 0 15px; +} + +.headNumBox { + font-size: 12px; + text-align: center; + color: #fff; +} + +.headNum { + height: 24px; + width: 100px; + border-radius: 12px; + background: #fff; + margin-bottom: 8px; + line-height: 24px; +} + +.headNumTxt span { + display: inline-block; + width: 2px; + height: 13px; + background: #fff; + margin: 0 7px; + position: relative; + top: 3px; +} + +.headMode { + font-size: 12px; + color: #fff; + position: relative; + /* line-height: 24px; */ + /* padding-right: 15px; */ + cursor: pointer; +} + +.headModeTxt { + line-height: 0; + /* background: #50AAF1; */ + padding: 0 15px; + border-radius: 13px; + position: relative; + z-index: 9; +} + + .headModeTxt * { + display: inline-block; + vertical-align: middle; + } + + .headModeTxt span { + line-height: 26px; + } + + .headModeTxt i { + font-size: 18px; + margin-left: 5px; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + } + +.headModeList { + position: absolute; + width: 100%; + right: 0; + top: 40px; + text-align: center; + /* background-color: #0078D7; + -webkit-box-shadow: 0 5px 6px rgba(64, 172, 255, .4); + -moz-box-shadow: 0 5px 6px rgba(64, 172, 255, .4); + box-shadow: 0 5px 6px rgba(64, 172, 255, .4); */ + line-height: 24px; + /* padding: 5px 0; */ + border-radius: 3px; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + opacity: 0; + z-index: -1; + padding-top: 18px; +} + + .headModeList li { + margin-bottom: 5px; + } + +.headMode:hover .headModeList { + top: 18px; + opacity: 1; + z-index: 1; +} + +.headModeList li.active { + /* background-color: #036AC9; */ + border-radius: 13px; +} + +.headModeList a { + font-size: 12px; + color: #fff; +} + +.downloadFx { + color: #fff; +} + + .downloadFx * { + vertical-align: middle; + display: inline-block; + } + + .downloadFx img { + width: 18px; + } + +.noCard { + position: relative; + transform: translateY(-50%); + top: 50%; + /* font-size: ; */ + text-align: center; +} + +.noCardImg { + line-height: 0; +} + + .noCardImg img { + width: 50px; + } + +.noCardTxt { + margin-top: 10px; +} + +.layerInput { + padding: 20px 30px 0; +} + + .layerInput input { + display: block; + width: 100%; + padding: 5px 10px; + line-height: 24px; + border-radius: 4px; + } + +/*****header*******/ + +/*****public*******/ +.warpper { + height: calc(100% - 70px); +} + +.inSec3RowBox { + height: calc(100% - 76px); + margin: 10px -10px; +} + +.inSec3Row { + height: 100%; + overflow: auto; + display: none; +} + + .inSec3Row:first-child { + display: block; + } + +.inSec3Col6 { + /* width: 50%; */ + width: 840px; + float: left; + padding: 10px; +} + +.inSec3Col3 { + /* width: 25%; */ + width: 420px; + float: left; + padding: 10px; +} + +.inSecT { + color: #fff; + font-size: 16px; + line-height: 24px; + padding: 5px 15px; + /* background-color: #198BE3; */ + height: 34px; + line-height: 0; +} + + .inSecT * { + display: inline-block; + vertical-align: middle; + } + + .inSecT span { + line-height: 24px; + } + +.inSecTMore { + font-style: normal; + display: inline-block; + width: 30px; + height: 16px; + text-align: center; + line-height: 16px; + border-radius: 9px; + font-size: 12px; + color: #fff; + margin-left: 6px; + /* margin-top: 4px; */ + background: #FFAC41; + position: relative; +} + + .inSecTMore::after { + content: ''; + position: absolute; + left: -8px; + top: 50%; + margin-top: -5px; + border: 5px solid transparent; + border-right-color: #FFAC41; + } + +.more { + width: 35px; + height: 20px; + text-align: center; + line-height: 0; + cursor: pointer; + display: block; + border-radius: 10px; + float: right; + margin-top: 2px; + /* background-color: #75B9EE; */ +} + + .more span { + display: inline-block; + width: 4px; + height: 4px; + border-radius: 50%; + background: #fff; + margin: 8px 2px 0; + } + +.noLoginImg { + line-height: 0; +} + + .noLoginImg img { + width: 70px; + } + +.noLoginTxt { + font-size: 14px; + color: #B8B8B8; +} + +.noLogin { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + margin: auto; + width: 110px; + height: 130px; + text-align: center; +} + + + +/*****public*******/ + + +/*****index_sec1*******/ + +.inSecLeftBox { + position: fixed; + z-index: 99; + top: 52%; + transform: translateY(-50%); + left: 0; + width: 62px; + text-align: center; + font-size: 12px; + background-color: #fff; + -webkit-box-shadow: 0 0 10px rgba(25, 139, 227, .3); + -moz-box-shadow: 0 0 10px rgba(25, 139, 227, .3); + box-shadow: 0 0 10px rgba(25, 139, 227, .3); + cursor: pointer; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + transition: all .4s .4s; + -moz-transition: all .4s .4s; + -ms-transition: all .4s .4s; + -o-transition: all .4s .4s; + -webkit-transition: all .4s .4s; +} + +.index_sec1.active .inSecLeftBox { + left: -62px; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all .4s; + -moz-transition: all .4s; + -ms-transition: all .4s; + -o-transition: all .4s; + -webkit-transition: all .4s; +} + +.inSecLeftCon { + border-bottom: 1px solid #F0F0F0; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + padding: 11px 0; +} + + .inSecLeftCon:last-child { + border-bottom: 0px solid #F0F0F0; + } + +.inSecLeftImg { + line-height: 0; + margin-bottom: 6px; +} + + .inSecLeftImg img { + width: 16px; + } + + .inSecLeftImg img:last-child { + display: none; + } + +.inSecLeftTxt { + color: #424242; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + +/* .inSecLeftCon:hover { + background-color: #198BE3; + border-color: #198BE3; +} */ + +.inSecLeftCon:hover .inSecLeftImg img:first-child { + display: none; +} + +.inSecLeftCon:hover .inSecLeftImg img:last-child { + display: inline-block; +} + +.inSecLeftCon:hover .inSecLeftTxt { + color: #fff; +} + +.indexSec1Con { + width: 415px; + background-color: #fff; + position: fixed; + z-index: 99; + left: -415px; + top: 90px; + bottom: 0; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all .4s; + -moz-transition: all .4s; + -ms-transition: all .4s; + -o-transition: all .4s; + -webkit-transition: all .4s; +} + +.index_sec1.active .indexSec1Con { + left: 0; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + transition: all .4s .6s; + -moz-transition: all .4s .6s; + -ms-transition: all .4s .6s; + -o-transition: all .4s .6s; + -webkit-transition: all .4s .6s; +} + +.inSec1Tab { + text-align: center; + overflow: hidden; + background-color: #fff; + border-bottom: 1px solid #F0F0F0; + padding: 10px 0; + cursor: pointer; +} + +.inSec1TabBox { + width: 33.333333%; + float: left; + line-height: 0; + position: relative; +} + + .inSec1TabBox.active:after { + content: ''; + position: absolute; + left: 0; + right: 0; + bottom: -11px; + height: 3px; + /* background-color: #198BE3; */ + } + + .inSec1TabBox * { + display: inline-block; + vertical-align: middle; + } + + .inSec1TabBox span { + display: inline-block; + line-height: 24px; + } + + .inSec1TabBox img { + width: 16px; + margin-right: 5px; + } + +.inSec1Box { + display: none; + height: 100%; +} + + .inSec1Box.active { + display: block; + } + +.inSec1List1 { + width: 130px; + float: left; + height: 100%; + overflow: auto; +} + + .inSec1List1 li { + padding: 5px 12px 5px; + cursor: pointer; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + } + + .inSec1List1 a { + display: block; + font-size: 14px; + line-height: 0; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + } + + .inSec1List1 span { + display: inline-block; + vertical-align: middle; + line-height: 24px; + } + + .inSec1List1 span:first-child { + width: 85%; + } + + .inSec1List1 span:last-child { + width: 11%; + } + +.inSec1List2 { + margin-left: 130px; + height: 100%; + overflow-y: auto; + position: relative; +} + + .inSec1List2 li, + .inSec1Drag div { + padding: 5px 12px; + transition: background 0.3s; + -moz-transition: background 0.3s; + -ms-transition: background 0.3s; + -o-transition: background 0.3s; + -webkit-transition: background 0.3s; + } + +.inSec1Drag div { + cursor: pointer; + position: relative; + overflow: hidden; +} + +/* .inSec1Drag div:hover { + background-color: #D8EEFF; +} */ + +.inSec1List2 a { + display: block; + line-height: 25px; + font-size: 14px; + position: relative; +} + +.inSec1List2 span, +.inSec1Drag span { + display: block; + margin-left: 30px; + margin-right: 30px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.inSec1List2 img, +.inSec1Drag img { + width: 22px; + float: left; +} + +.inSec1List2 .fa { + position: absolute; + right: 0; + top: 0; + line-height: 25px; +} + +.inSec1List2 .fa-heart { + color: #F6685E; +} + +.inSec1List2 .fa-heart-o { + color: #198be3; + /* color: #ffdbd9; */ +} + +.indSec1Box { + height: calc(100% - 60px); +} + +.indSec1Line { + height: 15px; + position: relative; + z-index: 9; + background-color: #fff; +} + +.aLeft { + padding-right: 5px; + position: absolute; + z-index: 9; + width: 18px; + height: 88px; + line-height: 0; + right: -18px; + top: 0; + bottom: 0; + margin: auto; + text-align: center; + background-color: #fff; + border-radius: 0 8px 8px 0; + webkit-box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + cursor: pointer; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + + /* .aLeft:hover { + background-color: #D8EEFF; +} */ + + .aLeft i { + line-height: 88px; + font-size: 20px; + color: #C8C8C8; + } + +/* .aLeft:hover i{ + color: #fff; +} */ +.inSec1Drag a { + padding-right: 50px; + position: relative; +} + +.inSec1Drag .fa { + width: 40px; + height: 20px; + text-align: center; + line-height: 20px; + border-radius: 13px; + position: absolute; + top: 0; + right: 12px; + bottom: 0; + color: #fff; + font-size: 14px; + cursor: pointer; + margin: auto; + transition: background 0.3s; + -moz-transition: background 0.3s; + -ms-transition: background 0.3s; + -o-transition: background 0.3s; + -webkit-transition: background 0.3s; +} + +.inSec1Drag .fa-minus { + background-color: #B2B2B2; +} + +.inSec1Drag .fa-plus { + background-color: #D2E4FF; +} + + .inSec1Drag .fa-plus:hover { + background-color: #69A5FE; + } + +.inSec1Drag .fa-minus:hover { + background-color: #FD6F22; +} + +/*****index_sec1*******/ + + +/*****index_sec2*******/ +.index_sec2 .inSecLeftBox { + left: inherit; + right: 0; +} + +.inSec2Box { + width: 350px; + background-color: #fff; + position: fixed; + z-index: 99; + right: -415px; + top: 90px; + bottom: 0; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all .4s; + -moz-transition: all .4s; + -ms-transition: all .4s; + -o-transition: all .4s; + -webkit-transition: all .4s; +} + +.index_sec2.active .inSec2Box { + right: 0; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + transition: all .4s .6s; + -moz-transition: all .4s .6s; + -ms-transition: all .4s .6s; + -o-transition: all .4s .6s; + -webkit-transition: all .4s .6s; +} + +.index_sec2.active .inSecLeftBox { + right: -62px; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all .4s; + -moz-transition: all .4s; + -ms-transition: all .4s; + -o-transition: all .4s; + -webkit-transition: all .4s; +} + +.aRight { + padding-left: 5px; + position: absolute; + z-index: 9; + width: 18px; + height: 88px; + line-height: 0; + left: -18px; + top: 0; + bottom: 0; + margin: auto; + text-align: center; + background-color: #fff; + border-radius: 8px 0 0 8px; + webkit-box-shadow: -5px 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: -5px 0 10px rgba(114, 165, 205, 0.25); + box-shadow: -5px 0 10px rgba(114, 165, 205, 0.25); + cursor: pointer; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + + /* .aRight:hover { + background-color: #D8EEFF; +} */ + + .aRight i { + line-height: 88px; + font-size: 20px; + color: #C8C8C8; + } + +.inSec2Tab { + text-align: center; + overflow: hidden; + background-color: #fff; + border-bottom: 1px solid #F0F0F0; + padding: 10px 0; + cursor: pointer; +} + +.inSec2TabBox { + width: 50%; + float: left; + line-height: 0; + position: relative; +} + + .inSec2TabBox.active:after { + content: ''; + position: absolute; + left: 0; + right: 0; + bottom: -11px; + height: 3px; + /* background-color: #198BE3; */ + } + + .inSec2TabBox * { + display: inline-block; + vertical-align: middle; + } + + .inSec2TabBox span { + display: inline-block; + line-height: 24px; + } + + .inSec2TabBox img { + width: 16px; + margin-right: 5px; + } + +.indexSec2Box { + height: calc(100% - 60px); +} + +.inSec2Con { + display: none; + height: 100%; +} + + .inSec2Con.active { + display: block; + } + +.inSec2L { + height: 100%; + width: 110px; + float: left; + /* background-color: #F2F9FF; */ +} + +.inSec2R { + margin-left: 110px; + height: 100%; + position: relative; +} + +.inSec2Llist li { + /* border-bottom: 1px solid #e0edef; */ + padding: 5px 12px 5px; + line-height: 20px; + cursor: pointer; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + +.inSec2Llist span { + display: block; + width: 70px; +} + +.inSec2Llist i { + font-style: normal; + display: inline-block; + float: right; + width: 18px; + height: 16px; + font-size: 12px; + color: #fff; + margin-left: 6px; + text-align: right; +} + +/* .inSec2Llist li.active, +.inSec2Llist li:hover { + background: #D8EEFF; + border-bottom-color: #D8EEFF; +} */ + +.indexSec2Li { + border-bottom: 1px dashed #EAEAEA; + padding: 10px 30px 10px 40px; + position: relative; + cursor: pointer; +} + + .indexSec2Li, + .indexSec2Li > span { + display: block; + } + +.indexSec2T { + position: relative; + line-height: 30px; +} + + .indexSec2T img { + position: absolute; + left: -25px; + top: 50%; + transform: translateY(-50%); + width: 20px; + } + + .indexSec2T span { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + +.indexSec2Li > i { + position: absolute; + top: 5px; + font-size: 16px; + right: 10px; + color: #a2a9a7; + cursor: pointer; +} + +.indexSec2Txt { + font-size: 12px; + color: #a2a9a7; + line-height: 24px; +} + +/*****index_sec2*******/ + + +/*****index_sec3*******/ +.index_sec3, +.layui-form { + height: 100%; +} + +.indexSec3Box { + margin: 0 120px; + height: 100%; + transition: padding .4s; + -moz-transition: padding .4s; + -ms-transition: padding .4s; + -o-transition: padding .4s; + -webkit-transition: padding .4s; +} + +.inSec3Head { + background-color: #fff; + margin: 20px 0 0; + display: inline-block; + line-height: 0; + webkit-box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 5px 0 10px rgba(114, 165, 205, 0.25); + cursor: pointer; +} + + .inSec3Head > *, + .inSec3HeadTabBox > * { + display: inline-block; + vertical-align: middle; + } + +.inSec3HeadTab { + padding: 0 15px; + position: relative; +} + + .inSec3HeadTab.active:after { + content: ''; + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 2px; + /* background-color: #198BE3; */ + } + + .inSec3HeadTab > * { + display: inline-block; + vertical-align: middle; + } + +.inSec3HeadTabImg { + line-height: 0; + width: 18px; +} + + .inSec3HeadTabImg img { + width: 100%; + } + + .inSec3HeadTabImg img:last-child { + display: none; + } + +.inSec3HeadTab.active .inSec3HeadTabImg img:last-child { + display: inline-block; +} + +.inSec3HeadTab.active .inSec3HeadTabImg img:first-child { + display: none; +} + +.inSec3HeadTabTxt { + height: 36px; + line-height: 36px; + margin-left: 5px; +} + +.inSec3HeadLine { + height: 24px; + width: 1px; + background-color: #EAEAEA; +} + +.inSec3Setting, +.inSec3HeadAdd { + padding: 0 15px; +} + +.inSec3Box { + -webkit-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + background-color: #fff; +} + +.inSec3Con { + overflow: auto; + height: 200px; + position: relative; +} + +.inSec3Major { + float: left; + width: 25%; + padding: 19px 10px; + border-left: 1px dashed #EAEAEA; + border-bottom: 1px dashed #EAEAEA; +} + +.inSec3MajorImgBox { + line-height: 0; +} + + .inSec3MajorImgBox * { + display: inline-block; + vertical-align: middle; + } + +.inSec3MajorImg { + width: 24px; + margin-right: 10px; +} + + .inSec3MajorImg img { + width: 100%; + } + +.inSec3MajorImgBox span { + width: 70%; + line-height: 24px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.inSec3MajorTxt { + text-align: right; + margin-top: 10px; +} + + .inSec3MajorTxt span { + font-weight: bold; + font-size: 20px; + } + +.inSec3Major:nth-child(1) .inSec3MajorTxt span { + color: #198BE3; +} + +.inSec3Major:nth-child(2) .inSec3MajorTxt span { + color: #F6695F; +} + +.inSec3Major:nth-child(3) .inSec3MajorTxt span { + color: #59D078; +} + +.inSec3Major:nth-child(4) .inSec3MajorTxt span { + color: #8652FE; +} + +.inSec3Major:nth-child(5) .inSec3MajorTxt span { + color: #ECA202; +} + +.inSec3Major:nth-child(6) .inSec3MajorTxt span { + color: #00E7D4; +} + +.inSec3Major:nth-child(7) .inSec3MajorTxt span { + color: #665FF5; +} + +.inSec3Major:nth-child(8) .inSec3MajorTxt span { + color: #DBC009; +} + +.inSec3L { + width: 130px; + float: left; + /* background-color: #F2F9FF; */ + height: 100%; + overflow: auto; +} + +.inSec3R { + margin-left: 130px; + height: 100%; + overflow: auto; +} + +.workList li { + padding: 7px 5px; + /* border-bottom: 1px solid #E0F1FF; */ + line-height: 0; + cursor: pointer; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + + /* .workList li.active { + background-color: #D6EDFF; +} */ + + .workList li > * { + display: inline-block; + vertical-align: middle; + } + +.workListImg img { + width: 100%; +} + +.workListImg { + width: 14px; + margin-right: 2px; + line-height: 0; +} + +.workList span { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 70px; + line-height: 20px; +} + +.workListTips span { + max-width: 59px; +} + +.workListInfo span { + width: 70px; +} + +.inSec3WorkBox { + padding: 0 10px; + display: none; + position: relative; + height: 100%; +} + + .inSec3WorkBox .inSec2List { + padding: 0; + } + + .inSec3WorkBox .inSec2T { + width: 65%; + } + + .inSec3WorkBox:first-child { + display: block; + } + +.inSec3Work { + border-bottom: 1px dashed #F0F0F0; + padding: 4px; + position: relative; +} + +.inSec3WorkT { + margin-right: 66px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.inSec3WorkTime { + font-size: 12px; + margin-top: 4px; + color: #C3C3C3; +} + +.inSec3WorkBtn { + position: absolute; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 50px; + height: 20px; + line-height: 20px; + text-align: center; + font-size: 12px; + /* background-color: #EAF5FF; */ + /* color: #198BE3; */ + border-radius: 10px; + cursor: pointer; +} + +.inSec3WorkBtn2 { + position: absolute; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 50px; + height: 20px; + line-height: 20px; + text-align: center; + font-size: 12px; + /* color: #198BE3; */ + border-radius: 10px; +} + +.inSec2List { + padding: 0 10px; + background: #fff; +} + + .inSec2List li { + padding: 9px 0; + border-top: 1px dashed #E7E7E7; + position: relative; + } + + .inSec2List li:first-child { + border: 0; + } + + .inSec2List a, + .inSec2List span { + display: block; + } + + .inSec2List a { + font-size: 14px; + } + +.inSec2T { + width: 70%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + + .inSec2T img { + float: left; + margin-right: 8px; + width: 18px; + margin-top: 3px; + } + +.inSec2Time { + text-align: right; + color: #C2C2C2; + float: right; +} + +.inSec3Num { + font-style: normal; + display: inline-block; + width: 18px; + height: 16px; + line-height: 16px; + border-radius: 9px; + font-size: 12px; + color: #fff; + margin-left: 6px; + /* color: #2E96E6; */ + text-align: right; +} + +.inSec3Link { + display: inline-block; + line-height: 24px; + padding: 0 15px; + color: #424242; + border-radius: 4px; + margin-top: 10px; + margin-left: 10px; +} + +.inSec3Link1 { + background-color: #CDFFF5; + border: 1px solid #1CDBB5; +} + +.inSec3Link2 { + background-color: #F2F9FF; + border: 1px solid #8ECBFF; +} + +.inSec3Link3 { + background-color: #FFF5B1; + border: 1px solid #F7DF6F; +} + +.inSec3Link4 { + background-color: #FFCDCA; + border: 1px solid #FDA09A; +} + +.inSec3Link5 { + background-color: #F0E9FF; + border: 1px solid #D3BEFF; +} + +.inSec3Link6 { + background-color: #CEFFFC; + border: 1px solid #79F1E9; +} + +.inSec3Link7 { + background-color: #E7EDFF; + border: 1px solid #A8BCF8; +} + +.inSec3Link8 { + background-color: #FFEEE1; + border: 1px solid #F7B482; +} + +.serRow { + overflow: hidden; + margin: 0 -4px; + padding-bottom: 10px; +} + +.serCol3 { + float: left; + width: 33.333333%; + padding: 0 4px; + margin-top: 12px; +} + +.serCon, +.serCon span { + display: block; + font-size: 12px; +} + +.serCon { + font-size: 14px; + text-align: center; +} + +.serImg { + margin: 0 auto 5px; + line-height: 0; + width: 35px; + height: 35px; + border-radius: 50%; + overflow: hidden; +} + + .serImg img { + width: 100%; + } + +.serTxt { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.propagateBox { + overflow: hidden; +} + +.propagateL { + float: left; + width: 110px; +} + +.propagateImg { + line-height: 0; + overflow: hidden; + padding-bottom: 51.798561%; + height: 0; +} + +.propagateImg { + width: 100%; +} + +.propagateR { + margin-left: 125px; +} + +.propagateT { + width: 100%; + display: -webkit-box !important; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; +} + +.specialBox { + display: block; + line-height: 0; + position: relative; + height: 0; + padding-bottom: 31.875%; + overflow: hidden; +} + +.specialBox1 { + padding-bottom: 19.094488%; + margin: 10px 10px 0; +} + +.specialBox img { + width: 100%; +} + +.specialTxt { + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + background-color: rgba(0, 0, 0, .7); + text-align: center; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; +} + + .specialTxt div { + color: #fff; + font-size: 12px; + position: absolute; + top: 50%; + left: 0; + right: 0; + transform: translateY(-50%); + } + +.specialBox:hover .specialTxt { + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; +} + +.specialRow { + overflow: hidden; + margin: 0 5px; + padding-bottom: 10px; +} + +.specialCol12 { + float: left; + width: 100%; + padding: 0 5px; + margin-top: 10px; +} + +.specialCol4 { + float: left; + width: 33.333333%; + padding: 0 5px; + margin-top: 10px; +} + +.echartBox { + height: 100%; +} + +.layui-input-block { + position: absolute; + right: 22px; + top: 10px; + width: 140px; +} + +.layui-input, +.layui-select, +.layui-textarea { + height: 34px; + line-height: 34px\9; +} + +.layui-form-select dl { + /* top: 38px; */ + max-height: 130px; +} + + .layui-form-select dl dd.layui-this { + background-color: #198BE3; + } + +.inSec3majorTxt { + position: absolute; + top: 0; + bottom: 0; + margin: auto; + height: 40px; + text-align: center; +} + +.inSec3majorTxt1 { + left: 0; + right: 65%; +} + +.inSec3majorTxt2 { + left: 0; + right: 0; +} + +.inSec3majorTxt3 { + left: 65%; + right: 0; +} + +.inSec3majorTxt div:first-child { + font-size: 14px; +} + +.inSec3majorTxt div:last-child { + font-size: 24px; + font-weight: bold; +} + +.overviewBox { + padding: 15px 20px; + width: 33.333333%; + float: left; + border-left: 1px dashed #EAEAEA; + border-bottom: 1px dashed #EAEAEA; +} + +.overviewImg { + line-height: 0; + margin-bottom: 3px; +} + + .overviewImg * { + display: inline-block; + vertical-align: top; + } + + .overviewImg img { + width: 45px; + margin-right: 10px; + } + + .overviewImg span { + line-height: 20px; + } + +.overviewTxt { + text-align: right; + font-size: 20px; + font-weight: bold; + /* line-height: 20px; */ +} + +.overviewBox:nth-child(1) .overviewTxt { + color: #4A9ADE; +} + +.overviewBox:nth-child(2) .overviewTxt { + color: #59D078; +} + +.overviewBox:nth-child(3) .overviewTxt { + color: #EF9508; +} + +.overviewBox:nth-child(4) .overviewTxt { + color: #F6685E; +} + +.overviewBox:nth-child(5) .overviewTxt { + color: #7A74F1; +} + +.overviewBox:nth-child(6) .overviewTxt { + color: #34E9F9; +} + + +/*****index_sec3*******/ + +/*****search*******/ +.search { + position: fixed; + z-index: 999; + left: 0; + right: 0; + height: 100%; + top: -100%; + /* background-color: #005190; */ + padding: 90px 40px 0; + transition: all 0.5s; + -moz-transition: all 0.5s; + -ms-transition: all 0.5s; + -o-transition: all 0.5s; + -webkit-transition: all 0.5s; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; +} + +body.active .search { + top: 0; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; +} + +.searchL { + float: left; + height: 100%; + width: 180px; + overflow: auto; +} + +.searchR { + margin-left: 200px; + height: 100%; + overflow: auto; + padding-top: 5px; +} + +.searchLT { + /* color: #82C7FE; */ + margin-bottom: 6px; + line-height: 24px; + font-weight: bold; +} + +.searchLList { + height: calc(100% - 30px); + overflow: auto; + /* padding-left: 10px; */ +} + + .searchLList li { + padding: 3px 12px; + transition: background 0.3s; + -moz-transition: background 0.3s; + -ms-transition: background 0.3s; + -o-transition: background 0.3s; + -webkit-transition: background 0.3s; + } + + .searchLList a { + display: block; + line-height: 26px; + font-size: 14px; + color: #fff; + } + + .searchLList span { + display: block; + margin-left: 30px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .searchLList img { + width: 22px; + float: left; + margin-top: 2px; + } + +.searchTop { + line-height: 22px; + margin-bottom: 15px; +} + + .searchTop > span { + float: left; + /* color: #63A7DF; */ + } + +.searchTopList { + margin-left: 70px; +} + + .searchTopList li { + display: inline-block; + padding: 0 15px; + margin: 0 2px; + color: #fff; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + cursor: pointer; + border-radius: 11px; + } + +/* .searchTopList li.active, +.searchTopList li:hover { + background-color: #0F85E2; +} */ + +.searchRTop { + line-height: 24px; + padding: 4px 12px; + /* background-color: #003E83; */ + margin-top: 20px; + /* color: #81C7FE; */ +} + +.searchList { + margin: 0 0 20px; +} + +.searchLi { + width: 170px; + margin-right: 20px; + margin-top: 20px; + float: left; + position: relative; +} + + .searchLi > * { + display: inline-block; + vertical-align: middle; + } + +.searchLiImg { + line-height: 0; + width: 40px; + height: 40px; + border-radius: 50%; + overflow: hidden; +} + + .searchLiImg img { + width: 100%; + } + +.searchLiTxt { + line-height: 24px; + margin-left: 5px; + color: #fff; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 70%; +} + +.searchLink, +.searchLink span { + display: block; +} + +.searchLink { + position: absolute; + left: 0; + top: 50%; + /* transform: translateY(-50%); */ + background-color: #fff; + width: 220px; + z-index: -1; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + transform: translateY(-50%) scale(1, 0); + -webkit-transform: translateY(-50%) scale(1, 0); + -moz-transform: translateY(-50%) scale(1, 0); + -o-transform: translateY(-50%) scale(1, 0); + -ms-transform: translateY(-50%) scale(1, 0); +} + +.searchLi:hover .searchLink { + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + z-index: 1; + transform: translateY(-50%) scale(1, 1); + -webkit-transform: translateY(-50%) scale(1, 1); + -moz-transform: translateY(-50%) scale(1, 1); + -o-transform: translateY(-50%) scale(1, 1); + -ms-transform: translateY(-50%) scale(1, 1); +} + +.searchLinkT { + padding: 0 8px; + line-height: 28px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + border-bottom: 1px solid #EEECEC; +} + +.searchLinkBox { + line-height: 0; + padding: 10px 8px; +} + + .searchLinkBox > * { + display: inline-block !important; + vertical-align: middle; + } + +.searchLinkImg { + width: 50px; + height: 50px; + border-radius: 50%; + overflow: hidden; +} + + .searchLinkImg img { + width: 100%; + } + +.searchLinkCon { + width: 130px; + margin-left: 15px; + line-height: 20px; +} + +.searchLinkTxt { + color: rgba(0, 0, 0, .5); +} + +/*****search*******/ + +/*****desktopSet*******/ +.desktopSetBox.active .desktopSetZhe { + display: block; +} + +.desktopSetBox.active .desktopSet { + z-index: 99999; + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; +} + +.desktopSetZhe { + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 99998; + background-color: rgba(0, 0, 0, .5); + display: none; +} + +.desktopSet { + padding: 1px 0; + width: 540px; + /* height: 300px; */ + position: fixed; + left: 0; + right: 0; + margin: auto; + top: 50%; + transform: translateY(-50%); + background-color: #fff; + border-radius: 10px; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + font-size: 12px; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + z-index: -1; +} + + .desktopSet > img { + position: absolute; + right: 10px; + top: 10px; + width: 22px; + cursor: pointer; + } + +.deskSetT { + text-align: center; + font-weight: bold; + font-size: 18px; + margin-top: 16px; + color: #333; +} + +.deskSetInfo { + text-align: center; + margin: 3px 0 20px; +} + +.deskSetList { +} + +.deskSetLi { + height: 52px; + padding: 11px 30px; + line-height: 0; + cursor: pointer; + position: relative; + transition: background 0.3s; + -moz-transition: background 0.3s; + -ms-transition: background 0.3s; + -o-transition: background 0.3s; + -webkit-transition: background 0.3s; +} + + .deskSetLi.active { + background-color: #FFF6DA; + } + + .deskSetLi:hover { + background-color: #E9F2FF; + } + + .deskSetLi .fa { + color: #A2A8B2; + line-height: 30px; + font-size: 16px; + } + + .deskSetLi .faR { + float: right; + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; + filter: alpha(opacity=0); + -moz-opacity: 0; + -khtml-opacity: 0; + opacity: 0; + } + + .deskSetLi:hover .faR { + filter: alpha(opacity=100); + -moz-opacity: 1; + -khtml-opacity: 1; + opacity: 1; + } + + .deskSetLi > * { + display: inline-block; + vertical-align: middle; + line-height: 0; + } + +.deskName { + width: 200px; + margin-left: 15px; + position: relative; +} + +.deskNameTxt { + line-height: 30px; + padding: 0 12px; +} + +.deskNameInput { + display: none; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + background: #D1D9E5; + border-radius: 15px; + padding: 0 60px 0 12px; +} + + .deskNameInput.active { + display: block; + } + + .deskNameInput input { + border: 0; + background: transparent; + line-height: 24px; + padding-top: 3px; + width: 100%; + display: block; + color: rgba(0, 0, 0, .6); + } + + .deskNameInput span { + position: absolute; + right: 20px; + top: 0; + line-height: 30px; + } + +.deskSetLiTips { + position: absolute; + top: 0; + bottom: 0; + right: 0; + text-align: right; + /* background: #fff; */ + width: 0; + transition: all .1s; + -moz-transition: all .1s; + -ms-transition: all .1s; + -o-transition: all .1s; + -webkit-transition: all .1s; + overflow: hidden; +} + +.deskSetLi.active .deskSetLiTips { + width: auto; +} + +.deskSetLiTips > * { + float: left; +} + +.deskSetLiTips > span { + line-height: 52px; + color: #fec006; + margin-right: 10px; +} + +.deskSetLiTips div { + width: 52px; + height: 100%; + text-align: center; +} + +.deskSetLiTips img { + height: 24px; + margin-top: 14px; +} + +.deskSetClose { + background: #A2A9A7; +} + +.deskSetTrue { + background: #FED55B; +} + +.deskSetBtn { + width: 120px; + height: 40px; + line-height: 40px; + border-radius: 20px; + color: #fff; + font-size: 16px; + text-align: center; + cursor: pointer; + margin: 30px auto; + background: rgba(105, 165, 254, .6); + transition: all 0.3s; + -moz-transition: all 0.3s; + -ms-transition: all 0.3s; + -o-transition: all 0.3s; + -webkit-transition: all 0.3s; +} + + .deskSetBtn:hover { + background: rgba(105, 165, 254, 1); + } + +/*****desktopSet*******/ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css new file mode 100644 index 000000000..8a859f1b1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css @@ -0,0 +1,44 @@ +.inSec2TabBox { + width: 33.333333%; +} +.in2Sec3Row { + padding: 0 24px 30px; + overflow: hidden; +} + +.in2Sec3Col6 { + width: 50%; + float: left; + padding: 0 24px; + margin-top: 24px; +} + +.in2Sec3Con, +.in2Sec3Con span { + display: block; +} + +.in2Sec3Con { + font-size: 14px; + text-align: center; +} + +.in2Sec3Img { + line-height: 0; + padding: 15px; + height: 70px; + width: 70px; + margin: 0 auto 10px; + border: 1px solid #EDEDED; + border-radius: 8px; +} + +.in2Sec3Img img { + width: 100%; +} + +.in2Sec3Txt { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css new file mode 100644 index 000000000..261122bb4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css @@ -0,0 +1,435 @@ +.in3Sec3L { + float: left; + /* padding-left: 40px; */ + width: 55%; + overflow: hidden; + margin-top: 12%; +} + +.in3Sec3LBox { + overflow: hidden; + font-size: 14px; + float: left; + margin-left: 28px; +} + +.in3Sec3LBox img { + float: left; + width: 35px; + margin-right: 10px; + margin-top: 6px; +} + +.in3Sec3LBox>div { + float: left; + font-size: 12px; +} + +.in3Sec3LT { + font-size: 23px; + font-weight: bold; + margin-top: 0px; +} + +.in3Sec3ClassTxt { + position: absolute; + right: 0; + top: 0; + bottom: 0; + text-align: center; + margin: auto; + height: 24px; + width: 45%; + line-height: 24px; + font-size: 14px; +} + +#class { + float: right; + width: 45%; +} + +.classSort { + right: inherit; + left: 28px; + margin-left: 0; +} + +.in3Sec3Total { + color: #424242; + font-size: 14px; + margin: 20px 0; +} + +.in3Sec3Total b { + font-size: 20px; +} + +.in3Sec3PerBox { + margin-top: 15px; +} + +.in3Sec3Per { + color: #424242; + display: inline-block; + position: relative; + font-size: 14px; +} + +.in3Sec3Per b { + font-size: 16px; +} + +.in3Sec3Icon { + position: absolute; + top: 50%; + margin-top: -8px; + left: calc(100% + 10px); + height: 16px; + width: 32px; + line-height: 16px; + font-size: 12px; + color: #fff !important; + border-radius: 8px; + text-align: center; +} + +.in3Sec3Icon::before { + content: ''; + position: absolute; + top: 50%; + left: -8px; + margin-top: -5px; + border: 5px solid transparent; + color: #fff; +} + +.in3Sec3Icon.in3Sec3Green { + background-color: #0BB56C; +} + +.in3Sec3Icon.in3Sec3Green::before { + border-right-color: #0BB56C; +} + +.in3Sec3Icon.in3Sec3Red { + background-color: #EB5858; +} + +.in3Sec3Icon.in3Sec3Red::before { + border-right-color: #EB5858; +} + +.in3Sec3Line { + margin: 22px -22px; + height: 2px; + background-color: #FAFAFA; +} + +.in3Sec3Echart1Box { + height: 190px; + position: relative; +} + +.in3Sec3Echart1Con { + height: 24px; + position: absolute; + bottom: -10px; + left: 0; + margin: auto; + font-size: 12px; + right: 0; + text-align: center; +} + +.in3Sec3Echart1Con b { + font-size: 18px; + color: #EB5858; +} + +.in3Sec3Echart1 { + height: 100%; + margin-left: 100px; + padding-top: 1px; +} + +.in3Sec3Echart2 { + height: 100%; + padding-top: 1px; +} + +.in3Sec3Echart1Img { + position: absolute; + left: 100px; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 45px; + height: 63px; +} + +.teacherBox>* { + float: left; + width: 25%; +} + +.teacherCon { + padding-left: 25px; +} + +.ageTxt { + position: absolute; + height: 36px; + line-height: 18px; + top: 0; + bottom: 0; + left: 9%; + right: 0; + margin: auto; + text-align: center; + font-size: 12px; +} + +.organT { + text-align: center; + font-size: 14px; +} + +.organLine { + height: 150px; + margin-top: 10px; + width: 60px; + margin: 10px auto 0; + background-color: #F6685E; + position: relative; + padding-top: 2px; +} + +.organLine>div { + background-color: #fff; + height: 2px; + margin-top: 2px; + position: relative; + z-index: 3; +} + +.organLine div:first-child { + margin-top: 0; +} + +.organLine .organZ { + position: absolute; + left: 0; + right: 0; + bottom: 0; + background-color: #72A7F6; + z-index: 2; +} + +.organLine .organCon { + position: absolute; + width: 64px; + height: 54px; + background-color: transparent; + font-size: 12px; +} + +.organCon1 { + right: 110%; + top: 10%; +} + +.organCon2 { + left: 110%; + bottom: 10%; +} + +.organCon1 span { + color: #F6685E; +} + +.organCon2 span { + color: #72A7F6; +} + +.in3Sec3Echart1 { + height: 100%; + margin-left: 100px; + padding-top: 1px; +} + +.in3Sec3Echart2 { + height: 100%; + padding-top: 1px; +} + +.in3Sec3Echart1Img { + position: absolute; + left: 100px; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 45px; + height: 63px; +} + +.in3Sec3Echart1Img1 { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 45px; + height: 63px; +} + +.in3Sec3Echart1Con1 { + height: 46px; + position: absolute; + bottom: 0; + left: -30px; + margin: auto; + font-size: 12px; +} +.in3Sec3Echart1Con2 { + /* height: 46px; */ + position: absolute; + bottom: 42px; + left: 0; + right: 0; + margin: auto; + font-size: 12px; + text-align: center; +} +.in3Sec3Echart1Con3{ + position: absolute; + left: -30px; + top: 10px; + margin: auto; + font-size: 12px; +} +.in3Sec3Echart1Con1 b,.in3Sec3Echart1Con2 b,.in3Sec3Echart1Con3 b { + font-size: 18px; + color: #EB5858; +} +.in3Sec3Echart1Con2 b { + margin-left: 10px; +} +.in3Sec3Echart1 { + height: 100%; + margin-left: 100px; + padding-top: 1px; +} + +.in3Sec3Echart2 { + height: 100%; + padding-top: 1px; +} + +.in3Sec3Echart1Img { + position: absolute; + left: 100px; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 45px; + height: 63px; +} + +.toClass { + width: 50%; + height: 40%; + margin: 17% auto 0; + position: relative; + background-color: #F4F4F4; + border-radius: 8px; +} + +.toClassImg1 { + width: 100%; + position: absolute; + bottom: 100%; + left: 0; +} + +.toClassImg2 { + height: 36px; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; + line-height: 0; + text-align: center; + z-index: 3; +} + +.toClassImg2 img { + height: 100%; +} + +.toClassBl { + position: absolute; + z-index: 2; + left: 0; + right: 0; + bottom: 0; + border-radius: 0 0 8px 8px; +} + +.toClassBl.red { + background-color: #E44E4E; +} + +.toClassBl.blue { + background-color: #64CDFE; +} + +.toClassBl.green { + background-color: #0AB56B; +} + +.toClassLegend { + line-height: 0; + text-align: right; + position: absolute; + bottom: 0px; + right: 0; +} + +.toClassLegend * { + display: inline-block; + vertical-align: middle; + background-color: transparent; +} +.toClassLegend > *{ + float: left; + margin-top: 10px; +} +.toClassLegend .red i { + background-color: #E44E4E; +} + +.toClassLegend .blue i { + background-color: #64CDFE; +} + +.toClassLegend .green i { + background-color: #0AB56B; +} + +.toClassLegend i { + width: 10px; + height: 10px; + border-radius: 2px; + margin: 0 5px 0 10px; +} + +.toClassLegend span { + font-size: 12px; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/login5.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/login5.css new file mode 100644 index 000000000..db361bfce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/login5.css @@ -0,0 +1,231 @@ +.logins{ + display: none; +} +.loginZhe { + position: fixed; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: 99998; + background-color: rgba(0, 0, 0, .5); +} + +.loginBox { + width: 1000px; + position: fixed; + z-index: 99999; + left: 0; + right: 0; + top: 50%; + transform: translateY(-50%); + margin: auto; +} + +.loginLogo { + line-height: 0; + margin-bottom: 40px; +} + +.loginLogo * { + display: inline-block; + vertical-align: middle; +} + +.loginLogo img { + width: 410px; +} + +.loginEdition { + color: #4B45C9; + font-size: 14px; + margin-left: 20px; + margin-top: 14px; +} + +.login { + height: 585px; + -webkit-box-shadow: 0 0 10px rgba(177, 175, 211, .2); + -moz-box-shadow: 0 0 10px rgba(177, 175, 211, .2); + box-shadow: 0 0 10px rgba(177, 175, 211, .2); + background: #fff; + position: relative; + border-radius: 32px; + padding: 50px 70px; + background: url('../../images/DragSSO/login5-1.png'); + background-size: cover; + -moz-background-size: cover; + -webkit-background-size: cover; + -o-background-size: cover; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader (src='../../images/DragSSO/login5-1.png', sizingMethod='scale'); +} + +.loginTitle { + font-size: 24px; + color: #3B3A3A; + margin-bottom: 30px; + text-align: center; +} + +.loginTab { + position: absolute; + width: 46px; + left: -46px; + top: 65px; +} + +.loginTab div { + cursor: pointer; + border-radius: 8px 0 0 8px; + height: 46px; + line-height: 0; + text-align: center; + background: #fff; + margin-top: 5px; + -webkit-box-shadow: 0 0 10px rgba(208, 206, 236, .2); + -moz-box-shadow: 0 0 10px rgba(208, 206, 236, .2); + box-shadow: 0 0 10px rgba(208, 206, 236, .2); +} + +.loginTab div.active { + background: #198BE3; +} + +.loginTab img { + height: 22px; + margin-top: 12px; +} + +.loginTab div.active .loginTabImg1, +.loginTabImg2 { + display: none; +} + +.loginTab div.active .loginTabImg2 { + display: inline-block; +} + +.loginCon { + width: 310px; +} + +.loginInputTxt { + font-size: 14px; + color: #707070; + margin-bottom: 8px; +} + +.loginInput { + margin-bottom: 15px; + position: relative; +} + +.loginInput input { + height: 40px; + display: block; + width: 100%; + line-height: 26px; + padding: 7px 10px 7px 10px; +} + +.codeBox { + position: relative; +} + +#lr_verifycode_input { + width: 170px; +} + +.variCode { + position: absolute; + right: 0; + top: 0; + height: 100%; + width: 110px; + line-height: 0; +} + +.variCode img { + width: 100%; + height: 100%; +} + +.loginBtn { + overflow: hidden; + margin-top: 25px; +} + +.loginBtn input { + height: 48px; + cursor: pointer; + width: 100%; + background: #198BE3; + border-radius: 24px; + font-size: 16px; + color: #fff; + line-height: 46px; + border: 1px solid #198BE3; + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0) inset !important; +} + +.loginBtn2 { + margin-top: 10px; +} + +.loginBtn2 input { + background: #fff; + color: #198BE3; +} + +.qrCodeBox { + font-size: 14px; + display: none; +} + +#qrCode { + margin: 70px auto 10px; + width: 200px; +} + +.loginFooter { + position: absolute; + bottom: 0; + left: 0; + right: 0; + text-align: center; + color: #705EED; + font-size: 14px; + line-height: 30px; + /*background: #E8E9FD;*/ + padding: 20px 0; +} + +.tips { + position: absolute; + right: 42px; + bottom: 20px; + color: #6AB8FE; + font-size: 13px; +} +.tips img{ + margin-right: 5px; + position: relative; + top: -1px; +} +.wx{ + line-height: 0; + margin-top: 30px; + cursor: pointer; +} +.wx > *{ + display: inline-block; + vertical-align: middle; +} +.wx img{ + width: 40px; + margin-right: 10px; +} +.wx span{ + line-height: 24px; + color: #65C15D; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/red.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/red.css new file mode 100644 index 000000000..af70cc143 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/red.css @@ -0,0 +1,141 @@ +html,body{ + background: #FFE9E7; +} +.header{ + background-image:url('../../images/DragSSO/headBg-red.jpg'); + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (src='../../images/DragSSO/headBg-red.jpg', sizingMethod='scale'); +} +body.active .header { + background-image: url(../../images/DragSSO/headBg-red.jpg); +} +.headNum{ + color: #C32015; +} + +.inSec1List1{ + background: #FFF2F1; +} +.inSec1List1 li.active,.inSec1List1 li:hover{ + background: #FFD9D6; + border-bottom-color: #FFD9D6; +} +.inSec1List1 li.active a,.inSec1List1 li:hover a{ + color: #C32015; +} +.inSec1List1 li{ + border-bottom: 1px solid #FDE6E4; +} +.headModeTxt { + background: #ff2a1b; +} + +.headModeList { + background-color: #ff2a1b; + -webkit-box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); + box-shadow: 0 5px 6px rgba(114, 165, 205, 0.25); +} +.headModeList li.active { + background-color: #C32015; +} +.headTab li:after { + background: #DB7973; +} +.inSec3HeadTab.active:after { + background-color: #C32015; +} +.inSecLeftCon:hover { + background-color: #C32015; + border-color: #C32015; +} +.inSec1TabBox.active:after { + background-color: #C32015; +} +.index_sec2 .inSec1T{ + background: #C32015; +} +.inSec1List2 li.active,.inSec1List2 li:hover{ + background: #FFD9D6; +} +.aLeft:hover { + background-color: #FFD9D6; +} +.inSecT { + background-color: #C32015; +} +.more { + background-color: #DB7973; +} +.inSec3L { + background-color: #FFF2F1; +} +.workList li.active { + background-color: #FFD9D6; +} +.workList li { + border-bottom: 1px solid #FDE6E4; +} +.inSec3Num { + color: #C32015; +} +.inSec2TabBox.active:after { + background-color: #C32015; +} +.inSec2L { + background-color: #FFF2F1; +} +.inSec2Llist i { + color: #C32015; +} +.inSec3WorkBtn { + background-color: #FFF2F1; + color: #C32015; +} +.inSec3WorkBtn2 { + color: #C32015; +} + +.inSec1Drag div:hover { + background-color: #FFD9D6; +} +.inSec2Llist li { + border-bottom: 1px solid #FDE6E4; +} +.inSec2Llist li.active, +.inSec2Llist li:hover { + background: #FFD9D6; + border-bottom-color: #FFD9D6; +} +.aRight:hover { + background-color: #FFD9D6; +} +.inSecShadow{ + -webkit-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + -moz-box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); + box-shadow: 0 0 10px rgba(114, 165, 205, 0.25); +} +/* search */ +.search { + background-color: #79140d; +} +.searchLT { + color: #ce574e; +} +.searchTop>span { + color: #ce574e; +} +.searchTopList li.active, +.searchTopList li:hover { + background-color: #C32015; +} + +.searchRTop { + background-color: #63100a; + color: #ce574e; +} +.headSearchClose { + border: 1px solid #ea2d20; +} +.headSearchClose:hover { + background-color: #ea2d20; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close.png new file mode 100644 index 000000000..9b6fed025 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close2.png new file mode 100644 index 000000000..233036ea8 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/close2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/download.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/download.png new file mode 100644 index 000000000..96c8214ca Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/download.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/duigou.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/duigou.png new file mode 100644 index 000000000..89c747b29 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/duigou.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head1.png new file mode 100644 index 000000000..3f9cdf01b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head2.png new file mode 100644 index 000000000..a7282c4cd Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head3.png new file mode 100644 index 000000000..d7c75e42f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-1.png new file mode 100644 index 000000000..5d4c379d9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-2.png new file mode 100644 index 000000000..aa736481e Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-3.png new file mode 100644 index 000000000..2b58931fd Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4.png new file mode 100644 index 000000000..5f368a256 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/head4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-green.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-green.jpg new file mode 100644 index 000000000..8417c68fe Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-green.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-red.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-red.jpg new file mode 100644 index 000000000..7eed0c16b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg-red.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg.jpg new file mode 100644 index 000000000..649f82686 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg2.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg2.jpg new file mode 100644 index 000000000..bdebedef5 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/headBg2.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-10.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-10.png new file mode 100644 index 000000000..06a77b9fa Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-10.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-11.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-11.png new file mode 100644 index 000000000..71ae0ccb0 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-11.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-12.png new file mode 100644 index 000000000..7bed01fcc Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-13.png new file mode 100644 index 000000000..ac2626def Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-14.png new file mode 100644 index 000000000..17698f48f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-15.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-15.png new file mode 100644 index 000000000..7208427c3 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-15.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-16.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-16.png new file mode 100644 index 000000000..141e6e5fa Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-16.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-17.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-17.png new file mode 100644 index 000000000..da6cedf0f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-17.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-18.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-18.png new file mode 100644 index 000000000..fca85af47 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-18.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-19.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-19.png new file mode 100644 index 000000000..060be9fb3 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-19.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-2.png new file mode 100644 index 000000000..8e352a533 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-20.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-20.png new file mode 100644 index 000000000..a5727dbb8 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-20.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-21.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-21.png new file mode 100644 index 000000000..42dd8ab33 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-21.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-22.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-22.png new file mode 100644 index 000000000..ac67bff2c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-22.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-3.png new file mode 100644 index 000000000..6e41fa1b0 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-4.png new file mode 100644 index 000000000..357607b6a Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-5.png new file mode 100644 index 000000000..214ce1cdb Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-6.png new file mode 100644 index 000000000..750a4f488 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-7.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-7.png new file mode 100644 index 000000000..3fdb44ef1 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-7.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-8.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-8.png new file mode 100644 index 000000000..b8a8eac45 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-8.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-9.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-9.png new file mode 100644 index 000000000..a83348dd2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec1-9.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-1.png new file mode 100644 index 000000000..f3f32ec88 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-10.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-10.png new file mode 100644 index 000000000..5f610b91a Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-10.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-11.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-11.png new file mode 100644 index 000000000..b4dc58cee Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-11.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-12.png new file mode 100644 index 000000000..3b8906c9c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-13.png new file mode 100644 index 000000000..b9d60a746 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-14.png new file mode 100644 index 000000000..adb703b6c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-15.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-15.png new file mode 100644 index 000000000..5c6ab7b40 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-15.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-16.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-16.png new file mode 100644 index 000000000..b1ccc7410 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-16.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-17.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-17.png new file mode 100644 index 000000000..e52a905d9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-17.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-18.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-18.png new file mode 100644 index 000000000..59e14c6a9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-18.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-2.png new file mode 100644 index 000000000..054ced326 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-3.png new file mode 100644 index 000000000..2697b8222 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-4.png new file mode 100644 index 000000000..b86674cfa Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-5.png new file mode 100644 index 000000000..0ca384844 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-6.png new file mode 100644 index 000000000..d252f53c2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-7.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-7.png new file mode 100644 index 000000000..1cdc6214c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-7.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-8.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-8.png new file mode 100644 index 000000000..8b30feaf3 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-8.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-9.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-9.png new file mode 100644 index 000000000..9a3601687 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec2-9.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-10.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-10.png new file mode 100644 index 000000000..9f42aa8ca Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-10.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-11.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-11.png new file mode 100644 index 000000000..c0d4996ae Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-11.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-12.png new file mode 100644 index 000000000..1d8e52e79 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-13.png new file mode 100644 index 000000000..7efaa77e4 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-14.png new file mode 100644 index 000000000..dbd663593 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-15.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-15.png new file mode 100644 index 000000000..12370f8ba Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-15.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-2.png new file mode 100644 index 000000000..f928adff9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-3.png new file mode 100644 index 000000000..7177f372c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-4.png new file mode 100644 index 000000000..27e6f5ae8 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-5.png new file mode 100644 index 000000000..b2aed009b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-6.png new file mode 100644 index 000000000..9f063ee93 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-7.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-7.png new file mode 100644 index 000000000..bd5ba49d6 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-7.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-8.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-8.png new file mode 100644 index 000000000..5ab1524ef Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-8.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-9.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-9.png new file mode 100644 index 000000000..760422e2f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec3-9.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-12.png new file mode 100644 index 000000000..451237ae9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-13.png new file mode 100644 index 000000000..fafaab632 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-14.png new file mode 100644 index 000000000..bb2a5d27b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-3.png new file mode 100644 index 000000000..3c585561b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-4.png new file mode 100644 index 000000000..4198b1fe7 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-5.png new file mode 100644 index 000000000..05956c886 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-6.png new file mode 100644 index 000000000..d0fd06912 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/inSec6-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-1.png new file mode 100644 index 000000000..429df6723 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-10.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-10.png new file mode 100644 index 000000000..86dde4877 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-10.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-11.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-11.png new file mode 100644 index 000000000..cf240d540 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-11.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-12.png new file mode 100644 index 000000000..68790d360 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-13.png new file mode 100644 index 000000000..4d368c84f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-14.png new file mode 100644 index 000000000..346b264ff Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-15.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-15.png new file mode 100644 index 000000000..143854911 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-15.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-16.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-16.png new file mode 100644 index 000000000..be1f8a817 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-16.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-17.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-17.png new file mode 100644 index 000000000..82e25455b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-17.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-18.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-18.png new file mode 100644 index 000000000..fe90c9626 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-18.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-19.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-19.png new file mode 100644 index 000000000..2a337cb9d Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-19.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-2.png new file mode 100644 index 000000000..bdaa283a7 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-20.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-20.png new file mode 100644 index 000000000..f112dcc78 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-20.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-3.png new file mode 100644 index 000000000..e59fe0060 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-4.png new file mode 100644 index 000000000..51bafc764 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-5.png new file mode 100644 index 000000000..f40889488 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-6.png new file mode 100644 index 000000000..ab446a298 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-7.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-7.png new file mode 100644 index 000000000..4ac02d0af Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-7.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-8.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-8.png new file mode 100644 index 000000000..bfefbf9e7 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-8.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-9.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-9.png new file mode 100644 index 000000000..9bcf6dce2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec1-9.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-1.png new file mode 100644 index 000000000..0ecaf7eb9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-2.png new file mode 100644 index 000000000..a36a9a1f2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-3.png new file mode 100644 index 000000000..3d3d9e595 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-4.png new file mode 100644 index 000000000..10fae5950 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-5.png new file mode 100644 index 000000000..cdb59d6c2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-6.png new file mode 100644 index 000000000..4a58f090f Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indSec3-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-1.png new file mode 100644 index 000000000..29e789937 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-2.png new file mode 100644 index 000000000..3ff69c9d4 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec2-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-1.png new file mode 100644 index 000000000..bff860ad2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-10.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-10.png new file mode 100644 index 000000000..39d0f6584 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-10.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-11.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-11.png new file mode 100644 index 000000000..ea4270327 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-11.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-12.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-12.png new file mode 100644 index 000000000..6bda8c3ca Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-12.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-13.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-13.png new file mode 100644 index 000000000..98555d500 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-13.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-14.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-14.png new file mode 100644 index 000000000..6fa8dbd04 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-14.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-15.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-15.jpg new file mode 100644 index 000000000..36d3ac8ee Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-15.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-16.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-16.jpg new file mode 100644 index 000000000..9b3d0aabc Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-16.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-17.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-17.jpg new file mode 100644 index 000000000..e57fde576 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-17.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-18.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-18.jpg new file mode 100644 index 000000000..83937370b Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-18.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-19.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-19.jpg new file mode 100644 index 000000000..d633804b9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-19.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-2.png new file mode 100644 index 000000000..7498414ae Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-20.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-20.jpg new file mode 100644 index 000000000..4d376d2fa Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-20.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-21.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-21.jpg new file mode 100644 index 000000000..7f40a0d39 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-21.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-22.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-22.jpg new file mode 100644 index 000000000..bdd27bfdb Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-22.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-23.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-23.png new file mode 100644 index 000000000..f3608e4bb Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-23.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-24.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-24.png new file mode 100644 index 000000000..4dab4febe Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-24.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-25.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-25.png new file mode 100644 index 000000000..28f762a05 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-25.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-26.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-26.png new file mode 100644 index 000000000..19f152cb8 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-26.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-27.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-27.png new file mode 100644 index 000000000..cb59b332d Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-27.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-28.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-28.png new file mode 100644 index 000000000..91ef32f68 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-28.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-3.png new file mode 100644 index 000000000..aafc97dca Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-4.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-4.png new file mode 100644 index 000000000..2190692e2 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-4.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-5.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-5.png new file mode 100644 index 000000000..89a88573a Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-5.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-6.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-6.png new file mode 100644 index 000000000..1cbe7d0bf Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-6.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-7.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-7.png new file mode 100644 index 000000000..4341d4784 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-7.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-8.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-8.png new file mode 100644 index 000000000..12d39ac04 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-8.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-9.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-9.png new file mode 100644 index 000000000..aa0a6c46e Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/indexSec3-9.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1.png new file mode 100644 index 000000000..484226f9c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1s.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1s.png new file mode 100644 index 000000000..8164fefed Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-1s.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2.png new file mode 100644 index 000000000..9f92d2a5a Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2s.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2s.png new file mode 100644 index 000000000..b1f5727aa Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-2s.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3.png new file mode 100644 index 000000000..3b9b49071 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3s.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3s.png new file mode 100644 index 000000000..a039a8b44 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/login5-3s.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/message.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/message.png new file mode 100644 index 000000000..8eeae583c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/message.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/noLogin.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/noLogin.png new file mode 100644 index 000000000..ad48927e3 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/noLogin.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/right2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/right2.png new file mode 100644 index 000000000..71c583a70 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/right2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/search.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/search.png new file mode 100644 index 000000000..8acfa668c Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/search.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin1.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin1.jpg new file mode 100644 index 000000000..3bc3c2412 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin1.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin2.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin2.jpg new file mode 100644 index 000000000..2ee09a947 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin2.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin3.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin3.jpg new file mode 100644 index 000000000..7d8a203e1 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/skin3.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/tips1.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/tips1.png new file mode 100644 index 000000000..a37906423 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/tips1.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/user.jpg b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/user.jpg new file mode 100644 index 000000000..9cacccfc9 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/user.jpg differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/verCode.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/verCode.png new file mode 100644 index 000000000..72d62f00d Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/verCode.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/weixin.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/weixin.png new file mode 100644 index 000000000..16bc4c3b5 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/DragSSO/weixin.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/aLeft.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/aLeft.js new file mode 100644 index 000000000..44b33f8b5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/aLeft.js @@ -0,0 +1,22 @@ +var inSec3Row = $('.inSec3Row'); +$(window).load(function() { + //左侧tab切换 + $('.inSec1Tab').on('click', '.inSec1TabBox', function() { + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active'); + $('.indSec1Box .inSec1Box').removeClass('active').eq(ind).addClass('active'); + }) + //左侧菜单显示隐藏 + $('.index_sec1').on('click', '.inSecLeftCon', function() { + var ind = $(this).index(); + var parents = $(this).parents('.index_sec1'); + parents.addClass('active').find('.inSec1TabBox').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec1Box').removeClass('active').eq(ind).addClass('active'); + $('.indexSec3Box').css('paddingLeft', '510px') + }).on('click', '.aLeft', function() { + var parents = $(this).parents('.index_sec1'); + parents.removeClass('active'); + $('.indexSec3Box').css('paddingLeft', '0') + }) +}) + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/inSecHead.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/inSecHead.js new file mode 100644 index 000000000..ba7ca308d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/inSecHead.js @@ -0,0 +1,302 @@ +$(document).ready(function () { + + //桌面切换 + $('.inSec3Head').on('click', '.inSec3HeadTab', function () { + if ($(this).hasClass('active')) return; + var ind = $(this).attr('ind'); + $('.inSec3Row.active').sortable("destroy"); + $(this).addClass('active').siblings('.inSec3HeadTab').removeClass('active'); + $('.inSec3Row').css('display', 'none').removeClass('active').siblings('.inSec3Row[ind="' + ind + '"]').fadeIn().addClass('active'); + sortableInit(); + }); + //桌面设置弹框中的事件 + $('.desktopSetBox').on('click', '.faR', function () {//点击默认桌面-恢复标识，显示恢复提示 + $(this).parents('.deskSetLi').addClass('active') + }).on('click', '.deskSetClose', function () {//点击提示中关闭标识，不显示恢复提示 + $(this).parents('.deskSetLi').removeClass('active'); + }).on('click', '.deskSetTrue', function () {//点击提示中确定标识，添加桌面或者重置桌面 + var parents = $(this).parents('.deskSetLi'); + if (parents.hasClass('deskSetLiNew')) { + var inputs = parents.find('input'); + desktopNew(inputs.val()); + inputs.val('新建桌面'); + } else { + var txt = $(this).parent().attr('txt'); + parents.removeClass('active'); + var desktopId = parents.attr('desktopId'); + var defaultFlag = parents.attr('defaultFlag'); + if (defaultFlag != 1) { + var ind = parents.attr('ind'); + desktopDel(ind, desktopId); + } else { + //ajax默认桌面的恢复操作 + if (desktopId != "" && desktopId != undefined) { + $.ajax({ + url: "/SSOSystem/RestoreDefaultDesktop", + headers: { __RequestVerificationToken: $.lrToken }, + data: { desktopId: desktopId }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + layer.msg('恢复成功！'); + //操作成功后执行的代码开始 + location.reload(); + //操作成功后执行的代码结束 + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + } + } + }).on('click', '.deskNameTxt', function () { + $(this).siblings('.deskNameInput').addClass('active').find('input').focus(); + }).on('blur', '.deskSetList input', function () { //桌面名称表单失去焦点时 + var parents = $(this).parents('.deskSetLi'); + var ind = parents.attr('ind'); + var txt = $(this).val(); + if (txt.length == 0) { + layer.msg('桌面不能为空！'); + $(this).focus(); + return; + } + //ajax桌面的修改名称操作 + var desktopId = parents.attr('desktopId'); + if (desktopId != "" && desktopId != undefined) { + $.ajax({ + url: "/SSOSystem/ModifyDesktop", + headers: { __RequestVerificationToken: $.lrToken }, + data: { desktopId: desktopId, desktopName: txt }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + layer.msg('桌面名称修改成功！'); + //操作成功后执行的代码开始 + parents.find('.deskNameInput').removeClass('active').siblings('.deskNameTxt').find('b').html(txt); + $('.inSec3HeadTab[ind="' + ind + '"] .inSec3HeadTabTxt').html(txt); + //操作成功后执行的代码结束 + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + }).on('input', '.deskNameInput input', function () { //监听桌面名称表单input事件 + var txt = $(this).val(); + var len = txt.length; + if (len >= 8) { + len = 8; + $(this).val(txt.substring(0, 8)) + } + $(this).siblings('span').html(len + '/8') + }).on('click', '.deskSetLiNew .deskName', function () { + $(this).parents('.deskSetLi').addClass('active'); + }).on('click', '.desktopSet > img', function () {//点击桌面设置弹框右上角关闭按钮 + $('.desktopSetBox').removeClass('active'); + }).on('click', '.deskSetBtn', function () {//点击桌面设置弹框的完成按钮 + $('.desktopSetBox').removeClass('active'); + }); + //点击桌面栏-设置按钮，显示桌面设置弹框 + $('.inSec3Setting').on('click', function () { + deskNum(); + $('.desktopSetBox').addClass('active'); + }); + //监听layer添加桌面弹框中表单的input事件 + $(document).on('input', '.layerInput input', function () { + var txt = $(this).val(); + var len = txt.length; + if (len >= 8) { + len = 8; + txt = txt.substring(0, 8); + } + if (len == 0) { + txt = '新建桌面'; + } + $(this).val(txt); + }); + //点击桌面栏-添加按钮，显示layer添加桌面弹框 + $('.inSec3HeadAdd').on('click', function () { + var _this = $(this); + layer.open({ + type: 1, + title: '命名桌面', + btnAlign: 'c', + content: htmlLayer, + area: ['300px', 'auto'], + btn: ['保存', '取消'], + yes: function (index, layero) { + //按钮【按钮一】的回调 + desktopNew($('.layerInput input').val()); + layer.close(index); + }, + btn2: function (index, layero) { + //按钮【按钮二】的回调 + //return false 开启该代码可禁止点击该按钮关闭 + } + }) + + }); + //桌面设置弹框中桌面的排序 + //$('.deskSetList').sortable({ + // opacity: 0.8, + // containment: '.deskSetList', + // handle: '.fa-navicon', + // // helper: 'clone', + // // scroll: false, + // cursor: "move", + // stop: function(event, ui) { + // //当排序停止时触发该事件。 + // var ind = $('.inSec3HeadTab.active').attr('ind'); + // $('.inSec3HeadTabBox').html(''); + // $('.deskSetList .deskSetLi').each(function(i, n){ + // var num = $(this).attr('ind'); + // var txt = $(n).find('input').val(); + // var className = $(n).find('.deskNameTxt span').length? 'newlyBuild' : ''; + // var active = num == ind? 'active' : ''; + // var html = '
    '+ + // '
    '+ txt +'
    '+ + // '
    '+ + // '
    '; + // $('.inSec3HeadTabBox').append(html) + // }) + // }, + //}); + +}); +$(window).load(function () { + cardData() +}); + +//新建桌面 +function desktopNew(name) { + var ind = getRandomNum(); + //ajax自建桌面新增操作，操作成功后执行下面代码，需要返回Id值并绑定到htmlT的desktopId中； + var modelCode = $('#ModelCode').val(); + var userId = $('#UserId').val(); + if (userId != "" && userId != undefined && modelCode != "" && modelCode != undefined && name != "" && name != undefined && ind != "" && ind != undefined) { + $.ajax({ + url: "/SSOSystem/AddDesktop", + headers: { __RequestVerificationToken: $.lrToken }, + data: { userId: userId, modelCode: modelCode, desktopName: name, desktopCode: ind }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + layer.msg('添加桌面成功！'); + if (res.data != null) { + //操作成功后执行代码开始 + var htmlC = '
    ' + noCard + '
    '; + var htmlT = '
    ' + + '
    ' + name + '
    ' + + '
    ' + + '
    '; + var deskSetLi = '
    ' + + '' + + '
    ' + + '
    ' + name + '
    ' + + '
    ' + + '' + + '4/8' + + '
    ' + + '
    ' + + '' + + '
    ' + + '确认删除该桌面?' + + '
    ' + + '' + + '
    ' + + '
    ' + + '' + + '
    ' + + '
    ' + + '
    '; + $('.deskSetLiNew').removeClass('active').find('.deskNameInput').removeClass('active'); + $('.inSec3Row.active').sortable("destroy"); + $('.inSec3RowBox').append(htmlC).find('.inSec3Row').css('display', 'none').removeClass('active').last().addClass('active').fadeIn(); + $('.inSec3HeadTabBox').append(htmlT).find('.inSec3HeadTab').removeClass('active').last().addClass('active'); + $('.deskSetList').append(deskSetLi); + sortableInit(); + deskNum(); + //最多新建3个桌面 + if (($('.inSec3HeadTab').length + 1) > desktopNum) { + $('.inSec3HeadAdd').css('display', 'none').next().css('display', 'none'); + $('.deskSetLiNew').css('display', 'none'); + } + //操作成功后执行代码结束 + } + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + +} +//删除桌面 +function desktopDel(ind, desktopId) { + //ajax自建桌面的删除操作 + if (desktopId != "" && desktopId != undefined) { + $.ajax({ + url: "/SSOSystem/DeleteDesktop", + headers: { __RequestVerificationToken: $.lrToken }, + data: { desktopId: desktopId }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + layer.msg('删除该桌面成功！'); + //操作成功后执行代码开始 + $('.deskSetLi[ind="' + ind + '"]').remove(); + $('.inSec3HeadTab[ind="' + ind + '"]').next().remove().end().remove(); + var inSec3Row = $('.inSec3Row[ind="' + ind + '"]'); + if (inSec3Row.hasClass('active')) { + $('.inSec3Row.active').sortable("destroy"); + inSec3Row.remove(); + $('.inSec3Row').eq(0).addClass('active').fadeIn(); + $('.inSec3HeadTab').eq(0).addClass('active'); + sortableInit() + } else { + inSec3Row.remove(); + } + deskNum(); + $('.inSec3HeadAdd').css('display', 'inline-block').next().css('display', 'inline-block'); + $('.deskSetLiNew').css('display', 'block'); + //操作成功后执行代码结束 + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + +} +//初始化桌面设置 +function deskNum() { + $('.deskSetInfo span').eq(0).html($('.newlyBuild').length); +} +//获取随机数 +function getRandomNum() { + var now = new Date(); + var result = now.getFullYear() + "" + now.getMonth() + "" + now.getDate() + "" + now.getHours() + "" + now.getMinutes() + "" + now.getSeconds() + "" + now.getMilliseconds(); + return result; +} +//console.log(getRandomNum()); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index.js new file mode 100644 index 000000000..83fc0745c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index.js @@ -0,0 +1,245 @@ +var inSec3Row = $('.inSec3Row'); + +layui.use('form', function() { + layer = layui.layer; + let form = layui.form; + + // form.render() + //监听select选择 专业总览 + form.on('select', function(data) { + //console.log(data); + }); +}); +// console.log(11) + +$(window).load(function() { + cardData() + //监测页面变化 + resizes() + setTimeout(function() { + resizes() + }, 0) + + //右侧菜单显示隐藏 + $('.index_sec2').on('click', '.inSecLeftCon', function() { + var ind = $(this).index(); + var parents = $(this).parents('.index_sec2'); + if(ind == 3){ + parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con') + }else{ + parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn(); + } + + parents.addClass('active') + $('.indexSec3Box').css('paddingRight', '445px') + }).on('click', '.aRight', function() { + var parents = $(this).parents('.index_sec2'); + parents.removeClass('active'); + $('.indexSec3Box').css('paddingRight', '0') + }) + //右侧tab切换 + $('.inSec2Tab').on('click', '.inSec2TabBox', function() { + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active'); + $('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active'); + }) + //办公事项 + $('.inSec3Con').on('click', '.workList li', function() { + if ($(this).hasClass('active')) return; + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active').parents('.inSec3Con').find('.inSec3WorkBox').css( + 'display', 'none').eq(ind).fadeIn(); + }) + + //任务 + $('.inSec2Con').on('click', '.inSec2Llist li', function() { + if ($(this).hasClass('active')) return; + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active').parents('.inSec2Con').find('.inSec3WorkBox').css( + 'display', 'none').eq(ind).fadeIn(); + }).on('click', '.indexSec2Li i', function(e) { + //消息移除 + //阻止默认浏览器动作(W3C) + if (e && e.preventDefault) { + e.preventDefault(); + } else { //IE中阻止函数器默认动作的方式 + window.e.returnValue = false; + } + e.stopPropagation(); + var parents = $(this).parents('.indexSec2Li'); + parents.animate({opacity: 0.2, left: '80%'}, 300, function(){ + parents.remove() + }) + }) + + + //办公业务流量 + //serviceEchart() + //专业总览 + //majorEchart() +}).resize(function() { + resizes() +}) + +function resizes() { + +} + + + +//专业总览 +//function majorEchart() { +// var myChart5 = echarts.init(document.getElementById('major')); + +// option = { +// tooltip: { +// trigger: 'item', +// formatter: '{b} : {c}' +// }, +// series: [{ +// name: '专业学生', +// type: 'pie', +// radius: [60, 75], +// center: ['50%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#6C5CEA', '#57C5F5', '#E7C900', '#FF9C95', '#59D078', '#C97FEF', '#ECBD02', '#DF59B8', '#F6685E', +// '#00E7B9', '#7A74F1', '#4A9ADE', '#33F0E5', '#ECBD02', '#DF59B8' +// ], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '物理', +// }, +// { +// value: 5, +// name: '数学', +// }, +// { +// value: 15, +// name: '化学', +// }, +// { +// value: 15, +// name: '历史', +// }, +// { +// value: 5, +// name: '医学', +// }, +// { +// value: 15, +// name: '计算机', +// }, +// { +// value: 15, +// name: '矿业', +// } +// ] +// }, { +// name: '班级总数', +// type: 'pie', +// radius: [50, 65], +// center: ['17%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#59D078', '#57C5F5', '#E7C900'], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '班级总数', +// }] +// }, { +// name: '专业教室', +// type: 'pie', +// radius: [50, 65], +// center: ['83%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#3E49E2', '#677BF5', '#67A0F5', '#E7C900'], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '教室1', +// }, { +// value: 5, +// name: '教室2', +// }, { +// value: 20, +// name: '教室3', +// }, { +// value: 30, +// name: '教室4', +// }] +// }, ] +// }; + +// // 使用刚指定的配置项和数据显示图表。 +// myChart5.setOption(option); +// window.addEventListener("resize", function() { +// myChart5.resize(); +// }); +//} + + +//办公业务流量 +//function serviceEchart() { +// // 基于准备好的dom，初始化echarts实例 +// myChart2 = echarts.init(document.getElementById('serviceEchart')); + +// option = { +// tooltip: { +// trigger: 'axis' +// }, +// color: ['#CB0005', '#EF9116', '#466AD2', '#7408A6', '#0CB5C4', '#DEBC03', '#0BB56C', '#CB1FA1'], +// legend: { +// data: ['语文'], +// icon: "circle", +// itemWidth: 7, +// right: '40px', +// top: '20px' +// }, +// grid: { +// left: '3%', +// right: '3%', +// bottom: '3%', +// top: '23%', +// containLabel: true +// }, +// xAxis: { +// type: 'category', +// name: '星期', +// boundaryGap: false, +// data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], +// formatter: function(params) { +// console.log(params) +// // return params[0].name + ' ： ' + params[0].value + ' 小时'; +// }, +// }, +// yAxis: { +// type: 'value', +// name: '办公量', +// }, +// series: [{ +// name: '办公量', +// type: 'line', +// stack: '总量', +// // lineStyle: { +// // color: '#000' +// // }, +// data: [120, 132, 101, 134, 90, 230, 210] +// }] +// }; + +// // 使用刚指定的配置项和数据显示图表。 +// myChart2.setOption(option); +// window.addEventListener("resize", function() { +// myChart2.resize(); +// }); +//} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js new file mode 100644 index 000000000..2ef5cf17c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js @@ -0,0 +1,227 @@ +var inSec3Row = $('.inSec3Row'); +var layer = null; +layui.use('form', function() { + layer = layui.layer; + let form = layui.form; + + // form.render() + //监听select选择 专业总览 + form.on('select', function(data) { + //console.log(data); + }); +}); +$(window).load(function() { + //监测页面变化 + resizes() + setTimeout(function() { + resizes() + }, 0) + //导航栏 + $(".headModeList li").eq(0).removeClass("active"); + $(".headModeList li").eq(1).addClass("active"); + $(".headModeList li").eq(2).removeClass("active"); + $(".headModeTxt").find('span').html($(".headModeList li").eq(1).find('a').html()); + + //右侧菜单显示隐藏 + $('.index_sec2').on('click', '.inSecLeftCon', function() { + var ind = $(this).index(); + var parents = $(this).parents('.index_sec2'); + if(ind == 3){ + parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con') + }else{ + parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn(); + } + + parents.addClass('active') + $('.indexSec3Box').css('paddingRight', '445px') + }).on('click', '.aRight', function() { + var parents = $(this).parents('.index_sec2'); + parents.removeClass('active'); + $('.indexSec3Box').css('paddingRight', '0') + }) + //右侧tab切换 + $('.inSec2Tab').on('click', '.inSec2TabBox', function() { + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active'); + $('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active'); + }) + //办公事项 + $('.inSec3Con').on('click', '.workList li', function() { + if ($(this).hasClass('active')) return; + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active').parents('.inSec3Con').find('.inSec3WorkBox').css( + 'display', 'none').eq(ind).fadeIn(); + }) + + + + //办公业务流量 + //serviceEchart() + //专业总览 + //majorEchart() +}).resize(function() { + resizes() +}) + +function resizes() { + +} + + + +//专业总览 +//function majorEchart() { +// var myChart5 = echarts.init(document.getElementById('major')); + +// option = { +// tooltip: { +// trigger: 'item', +// formatter: '{b} : {c}' +// }, +// series: [{ +// name: '专业学生', +// type: 'pie', +// radius: [60, 75], +// center: ['50%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#6C5CEA', '#57C5F5', '#E7C900', '#FF9C95', '#59D078', '#C97FEF', '#ECBD02', '#DF59B8', '#F6685E', +// '#00E7B9', '#7A74F1', '#4A9ADE', '#33F0E5', '#ECBD02', '#DF59B8' +// ], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '物理', +// }, +// { +// value: 5, +// name: '数学', +// }, +// { +// value: 15, +// name: '化学', +// }, +// { +// value: 15, +// name: '历史', +// }, +// { +// value: 5, +// name: '医学', +// }, +// { +// value: 15, +// name: '计算机', +// }, +// { +// value: 15, +// name: '矿业', +// } +// ] +// }, { +// name: '班级总数', +// type: 'pie', +// radius: [50, 65], +// center: ['17%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#59D078', '#57C5F5', '#E7C900'], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '班级总数', +// }] +// }, { +// name: '专业教室', +// type: 'pie', +// radius: [50, 65], +// center: ['83%', '50%'], +// label: { +// // show: true +// show: false +// }, +// color: ['#3E49E2', '#677BF5', '#67A0F5', '#E7C900'], +// // hoverAnimation: false, +// data: [{ +// value: 10, +// name: '教室1', +// }, { +// value: 5, +// name: '教室2', +// }, { +// value: 20, +// name: '教室3', +// }, { +// value: 30, +// name: '教室4', +// }] +// }, ] +// }; + +// // 使用刚指定的配置项和数据显示图表。 +// myChart5.setOption(option); +// window.addEventListener("resize", function() { +// myChart5.resize(); +// }); +//} + + +//办公业务流量 +//function serviceEchart() { +// // 基于准备好的dom，初始化echarts实例 +// myChart2 = echarts.init(document.getElementById('serviceEchart')); + +// option = { +// tooltip: { +// trigger: 'axis' +// }, +// color: ['#CB0005', '#EF9116', '#466AD2', '#7408A6', '#0CB5C4', '#DEBC03', '#0BB56C', '#CB1FA1'], +// legend: { +// data: ['语文'], +// icon: "circle", +// itemWidth: 7, +// right: '40px', +// top: '20px' +// }, +// grid: { +// left: '3%', +// right: '3%', +// bottom: '3%', +// top: '23%', +// containLabel: true +// }, +// xAxis: { +// type: 'category', +// name: '星期', +// boundaryGap: false, +// data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], +// formatter: function(params) { +// console.log(params) +// // return params[0].name + ' ： ' + params[0].value + ' 小时'; +// }, +// }, +// yAxis: { +// type: 'value', +// name: '办公量', +// }, +// series: [{ +// name: '办公量', +// type: 'line', +// stack: '总量', +// // lineStyle: { +// // color: '#000' +// // }, +// data: [120, 132, 101, 134, 90, 230, 210] +// }] +// }; + +// // 使用刚指定的配置项和数据显示图表。 +// myChart2.setOption(option); +// window.addEventListener("resize", function() { +// myChart2.resize(); +// }); +//} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js new file mode 100644 index 000000000..a7d46d77d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js @@ -0,0 +1,338 @@ +$(window).load(function () { + //导航栏 + $(".headModeList li").eq(0).removeClass("active"); + $(".headModeList li").eq(1).removeClass("active"); + $(".headModeList li").eq(2).addClass("active"); + $(".headModeTxt").find('span').html($(".headModeList li").eq(2).find('a').html()); + + //学生到课率预警 + var toClassNum = 20; + var toClassBl = $('.toClassBl') + if (toClassNum < 60) { + toClassBl.addClass('green').height(toClassNum + '%') + } else if (toClassNum >= 60 && toClassNum < 80) { + toClassBl.addClass('blue').height(toClassNum + '%') + } else if (toClassNum >= 80) { + toClassBl.addClass('red').height(toClassNum + '%') + } + //专业总览 + majorEchart() + + //课程总览 + classEchart() + + //教师年龄比例 + ageEchart() + + //教师学历比例 + eduEchart() + + // 学生成绩预警 + achWarnEchart() + + // 学生逃课预警 + skipEchart() + + var layer = null; + layui.use('form', function() { + layer = layui.layer; + let form = layui.form; + + // form.render() + //监听select选择 专业总览 + form.on('select', function(data) { + console.log(data); + }); + }); + + +}); + +//教师学历比例 +function eduEchart() { + var myChart6 = echarts.init(document.getElementById('education')); + option = { + tooltip: { + formatter: function(n) { //"{a}
    {b} : {d}({c}%)" + //console.log(n) + return n.name + '
    ' + n.value + '人' + '(' + n.percent + '%)' + } + }, + // calculable: true, + series: [{ + name: '教师学历比例', + type: 'funnel', + width: '100%', + height: '80%', + x: '0%', + y: '10%', + sort: 'ascending', + label: { + // show: false, + position: 'center' + }, + labelLine: { + show: false, + }, + color: ['#F6685E', '#ECBD02', '#67A0F5', '#198BE3', '#F6685E', '#DEBC03', '#0BB56C', '#CB1FA1'], + data: TeacherByHighestRecord + }] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart6.setOption(option); + window.addEventListener("resize", function() { + myChart6.resize(); + }); +} + +// 教师年龄比例 +function ageEchart() { + var myChart6 = echarts.init(document.getElementById('age')); + + option = { + tooltip: { + trigger: 'item', + formatter: '{b} : {c}人 ({d}%)' + }, + legend: { + // orient: 'vertical', + textStyle: { //图例文字的样式 + color: '#424242', + fontSize: 10 + }, + left: 0, + bottom: 0, + itemWidth: 8, + itemHeight: 8, + data: ['20~30岁', '30~40岁', '40~50岁', '50~60岁', '60岁以上'] + }, + color: ['#00E7B9', '#7486F1', '#FCF13E', '#ECBD02', '#F6685E', '#DEBC03', '#0BB56C', '#CB1FA1'], + series: [{ + name: '教师年龄比例', + type: 'pie', + radius: [30, 50], + center: ['55%', '50%'], + label: { + show: true + }, + roseType: 'radius', + data: TeacherByAge + }] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart6.setOption(option); + window.addEventListener("resize", function() { + myChart6.resize(); + }); +} + + +//课程总览 +function classEchart() { + // 基于准备好的dom，初始化echarts实例 + var myChart3 = echarts.init(document.getElementById('class')); + + option = { + tooltip: { + trigger: 'item', + formatter: '{b} : {c}' + }, + + series: [{ + name: '课程分类', + type: 'pie', + radius: [42, 57], + center: ['50%', '50%'], + hoverAnimation: false, + zlevel: 2, + color: ['#59D078', '#8F66E1'], + data: LessonBySort + }, + { + name: '课程类型', + type: 'pie', + radius: [70, 85], + center: ['50%', '50%'], + hoverAnimation: false, + color: ['#ECBD02', '#00E7B9'], + data: LessonByType + } + ] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart3.setOption(option); + window.addEventListener("resize", function() { + myChart3.resize(); + }); +} + +//专业总览 +function majorEchart() { + var myChart5 = echarts.init(document.getElementById('major')); + + option = { + tooltip: { + trigger: 'item', + formatter: '{b} : {c}' + }, + series: [{ + name: '专业学生', + type: 'pie', + radius: [60, 75], + center: ['50%', '50%'], + label: { + // show: true + show: false + }, + color: ['#6C5CEA', '#57C5F5', '#E7C900', '#FF9C95', '#59D078', '#C97FEF', '#ECBD02', '#DF59B8', '#F6685E', + '#00E7B9', '#7A74F1', '#4A9ADE', '#33F0E5', '#ECBD02', '#DF59B8' + ], + // hoverAnimation: false, + data: StuByMajor + }, { + name: '班级总数', + type: 'pie', + radius: [50, 65], + center: ['17%', '50%'], + label: { + // show: true + show: false + }, + color: ['#59D078', '#57C5F5', '#E7C900'], + // hoverAnimation: false, + data: [{ + value: ClassInfoTotalNum, + name: '班级总数', + }] + }, { + name: '专业教室', + type: 'pie', + radius: [50, 65], + center: ['83%', '50%'], + label: { + // show: true + show: false + }, + color: ['#3E49E2', '#677BF5', '#67A0F5', '#E7C900'], + // hoverAnimation: false, + data: [{ + value: ClassRoomTotalNum, + name: '教室总数', + }] + }, ] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart5.setOption(option); + window.addEventListener("resize", function() { + myChart5.resize(); + }); +} + +// 学生逃课预警 +function skipEchart() { + // 基于准备好的dom，初始化echarts实例 + var myChart8 = echarts.init(document.getElementById('skipClass')); + + option = { + tooltip: { + formatter: '{a} : {c}%' + }, + series: [{ + name: '学生逃课预警', + type: 'gauge', + radius: "70%", + center: ["50%", "50%"], + axisLine: { + show: true, + lineStyle: { + color: [ //表盘颜色 + [0.6, "#0AB56B"], //0-50%处的颜色 + [0.8, "#64CDFE"], //51%-70%处的颜色 + [1, "#E44E4E"], //70%-90%处的颜色 + ], + width: 15 //表盘宽度 + } + }, + splitLine: { + show: false, + }, + axisLabel: { + show: true, + formatter: function(v) { + // console.log(v) + switch (v + '') { + case '30': + return '低'; + case '70': + return '中'; + case '90': + return '高'; + } + }, + distance: -50 //文字离表盘的距离 + }, + axisTick: { + show: false, + }, + detail: { + formatter: "{score|{value}%}", + offsetCenter: [0, "80%"], + height: 30, + rich: { + score: { + fontSize: 16 + } + } + }, + data: [{ + value: 5, + name: '', + label: { + textStyle: { + fontSize: 12 + } + } + }] + }] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart8.setOption(option); + window.addEventListener("resize", function() { + myChart8.resize(); + }); +} + +// 学生成绩预警 +function achWarnEchart() { + var myChart5 = echarts.init(document.getElementById('achWarn')); + + option = { + tooltip: { + trigger: 'item', + formatter: '{b} : {c}人({d}%)' + }, + color: ['#EB5858', '#FB8383', '#FDACAC', '#FECACA', '#FFE2E2', '#DEBC03', '#0BB56C', '#CB1FA1'], + series: [{ + name: '全校', + type: 'pie', + radius: [50, 60], + center: ['50%', '50%'], + label: { + // show: false + }, + hoverAnimation: false, + data: StuScoreByMajor + }] + }; + + // 使用刚指定的配置项和数据显示图表。 + myChart5.setOption(option); + window.addEventListener("resize", function() { + myChart5.resize(); + }); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js new file mode 100644 index 000000000..82dfdc1b3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js @@ -0,0 +1,91 @@ +var layer = null; +var inSec3TabArr = [2, 3, 4]; +//inSec3TabArr.splice($.inArray(ind,inSec3TabArr),1); +//最多新建3个桌面 2个默认桌面 +var desktopNum = 5; +//没有卡片 +var noCard = '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    从左侧选择需要的应用卡片
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    '; +//没有数据 +var noHtml = '
    ' + + '
    ' + + '
    暂时没有数据
    ' + + '
    '; +// + +//添加桌面 +var htmlLayer = '
    '; +// 拖拽 排序 初始化 +function sortableInit() { + $('.inSec3Row.active').sortable({ + opacity: 0.8, + containment: '.inSec3Row.active', + handle: '.inSecT', + helper: 'clone', + scroll: false, + cursor: "move", + stop: function (event, ui) { + //当排序停止时触发该事件。 + serializes() + }, + }); + cardData() +} + +//当排序停止时触发该事件。 +function serializes() { + var gg = $(".inSec3Row.active").sortable("serialize", { + key: "sort" + }); + //console.log(gg);//sort=1&sort=2&sort=3&sort=4&sort=5&sort=6&sort=7&sort=8&sort=9&sort=10&sort=11&sort=12&sort=13 + var result = gg.replace(/sort=/g, "").replace(/&/g, ","); + //console.log(result); + //ajax提交用户排序 + var desktopId = $('.inSec3HeadTabBox').find('.inSec3HeadTab.active').attr('desktopId'); + var modelCode = $('#ModelCode').val(); + var userId = $('#UserId').val(); + if (userId != "" && userId != undefined && desktopId != "" && desktopId != undefined && modelCode != "") { + $.ajax({ + url: "/SSOSystem/SaveCardSort", + headers: { __RequestVerificationToken: $.lrToken }, + data: { userId: userId, modelCode: modelCode, desktopId: desktopId, cardSort: result }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + layer.msg('操作成功！'); + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + + +} +//初始化可用卡片 +function cardData() { + $('.inSec1Drag .fa').removeClass('fa-minus').addClass('fa-plus'); + $('.inSec3Row.active > div').each(function (i, n) { + var id = $(n).attr('id'); + if (id == 'noHtml') return + id = id.split('_')[1]; + $('#' + id).find('.fa').removeClass('fa-plus').addClass('fa-minus'); + }) +} + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js new file mode 100644 index 000000000..712f454ab --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js @@ -0,0 +1,144 @@ +// JavaScript Document localStorage +var skinLink = $('#skinLink'); +var skins = localStorage.getItem('skinLink'); +skins ? skinLink.attr('href', '/Content/css/DragSSO/' + skins + '.css') : ''; +$(document).ready(function () { + if (skins) { + skinLink.attr('href', '/Content/css/DragSSO/' + skins + '.css'); + $('.skins[skin="' + skins + '"]').addClass('active').siblings().removeClass('active'); + } + var qrCodeBox = $('.qrCodeBox'); + var loginForm = $('#loginForm'); + //var qrcode = new QRCode(document.getElementById("qrCode"), { + // width: 200, + // height: 200 + //}); + //makeCode('http://192.168.1.126:8081/Login/Index'); + // header search + $(document).on('click', function () { + $('.skinBox').removeClass('active'); + }).on('click', '.headSearch', function () { + $('body').addClass('active'); + }).on('click', '.headSearchImg', function () { + if ($('body').hasClass('active')) { + var keyword = $('#headSearchInput').val(); + if ($.trim(keyword) != "") { + $.each($('.search').find('.searchLi'), function (i, item) { + if ($(item).children('.searchLiTxt').html().indexOf(keyword) != -1) { + $(item).show(); + } else { + $(item).hide(); + } + }); + } else { + $('.search').find('.searchLi').show(); + } + } + }).on('click', '.searchTopList li', function () { + if ($(this).hasClass('active')) return; + $(this).addClass('active').siblings().removeClass('active'); + }).on('click', '.headSearchClose', function (e) { + //阻止默认浏览器动作(W3C) + if (e && e.preventDefault) { + e.preventDefault(); + } else { //IE中阻止函数器默认动作的方式 + window.e.returnValue = false; + } + e.stopPropagation(); + $('body').removeClass('active'); + //清空搜索 + if ($.trim($('#headSearchInput').val()) != "") { + setTimeout(function () { + $('#headSearchInput').val(''); + $('.search').find('.searchLi').show(); + }, 50); + } + }).on('click', '.signOut', function () { //退出登录 + //ajax退出操作 + layer.msg('退出中...', { + icon: 16 + , shade: 0.01 + }); + $.ajax({ + url: "/Login/OutLogin", + headers: { __RequestVerificationToken: $.lrToken }, + data: {}, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + location.href = "/SSOSystem/DragNoLogin"; + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + }).on('click', '.inSec1List2 .fa', function () { + //是否收藏 + if ($(this).hasClass('fa-heart')) { + $(this).removeClass('fa-heart').addClass('fa-heart-o'); + } else { + $(this).removeClass('fa-heart-o').addClass('fa-heart'); + } + }); + //登录 + $('.loginTab > div').click(function () { + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active'); + if (ind == 0) { + qrCodeBox.css('display', 'none'); + loginForm.stop().fadeIn(); + } else { + loginForm.css('display', 'none'); + qrCodeBox.stop().fadeIn(); + } + }) + //皮肤点击 + var skinT = null; + $('.skinBox').on('click', 'img', function (e) { + //阻止默认浏览器动作(W3C) + if (e && e.preventDefault) { + e.preventDefault(); + } else { //IE中阻止函数器默认动作的方式 + window.e.returnValue = false; + } + e.stopPropagation(); + var parents = $(this).parent(); + if (parents.hasClass('active')) { + parents.removeClass('active'); + } else { + parents.addClass('active'); + } + + }).hover(function () { + clearTimeout(skinT) + }, function () { + var _this = $(this); + skinT = setTimeout(function () { + _this.removeClass('active'); + }, 2000) + }).on('click', '.skins', function (e) { + //阻止默认浏览器动作(W3C) + if (e && e.preventDefault) { + e.preventDefault(); + } else { //IE中阻止函数器默认动作的方式 + window.e.returnValue = false; + } + e.stopPropagation(); + $(this).addClass('active').siblings().removeClass('active'); + var skin = $(this).attr('skin'); + localStorage.setItem('skinLink', skin); + skinLink.attr('href', '/Content/css/DragSSO/' + skin + '.css'); + }).on('click', '.skinT img', function () { + $('.skinBox').removeClass('active'); + }) + + function makeCode(urls) { + qrcode.makeCode(urls); + } +}) + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/sortable.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/sortable.js new file mode 100644 index 000000000..ea1893ac4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/sortable.js @@ -0,0 +1,59 @@ +$(document).ready(function(){ + //添加排序 + $('.inSec1Drag').on('click', '.fa-minus', function() { + //删除 + $(this).removeClass('fa-minus').addClass('fa-plus'); + var id = '#' + $('.inSec3Row.active').attr('ind') + '_' + $(this).parent().attr('id'); + // console.log($('.inSec3Row').find(id)) + $('.inSec3Row.active').find(id).remove(); + layer.msg('删除成功！'); + if($('.inSec3Row.active > div').length == 0){ + $('.inSec3Row.active').html(noCard) + } + serializes() + }).on('click', '.fa-plus', function() { + var noHtmls = $('.inSec3Row.active #noHtml'); + if(noHtmls.length){ + noHtmls.remove() + } + //添加 + $(this).removeClass('fa-plus').addClass('fa-minus'); + //点击卡片，增加相同的卡片块 + var id = 'id_' + $(this).parent().attr('id'); + var html = '
    ' + + '
    ' + + '
    ' + + '办公事项' + id + '' + + '' + + '
    ' + + '
    '+ noHtml +'
    ' + + '
    ' + + '
    '; + $('.inSec3Row.active').append(html); + layer.msg('添加成功！'); + serializes() + }) + // 拖拽 排序 + sortableInit() + + //添加拖拽 拖拽开始 + // $(".inSec1Drag div").draggable({ + // connectToSortable: ".inSec3Row", + // addClasses: false, + // iframeFix: '.inSec1List2', + // helper: "clone", + // revert: "invalid", + // zIndex: 99999, + // addClasses: 'active', + // scroll: false + // }); + // 禁用 draggable。 + // $( ".kk" ).draggable( "disable" ); + // 启用 draggable。 + // $( ".kk" ).draggable( "enable" ); + //sortable刷新 refresh() + + + +}) + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs index 7fd995799..f63d75211 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs @@ -57,6 +57,7 @@ namespace Learun.Application.Web.Controllers private Sys_UpdateRecordIBLL sys_UpdateRecordIBLL = new Sys_UpdateRecordBLL(); private Perm_FunctionIBLL perm_FunctionIBLL = new Perm_FunctionBLL(); private ICache redisCache = CacheFactory.CaChe(); + private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL(); #region 视图功能 public ActionResult ChangePwd() @@ -230,6 +231,11 @@ namespace Learun.Application.Web.Controllers string qingJuurl = ConfigurationManager.AppSettings["QingJuurl"]; string qingjuregisterurl = ConfigurationManager.AppSettings["QingJuRegisterurl"]; string defpwd = ConfigurationManager.AppSettings["defaultpwd"]; + //读取默认密码配置中已启用的密码 + if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null) + { + defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd; + } var qjinfo = qjAccountIbll.GetQingJu_UserAccountEntityByAccount(userinfo.account); if (qjinfo == null || string.IsNullOrEmpty(qjinfo.UserAccount)) { @@ -336,6 +342,11 @@ namespace Learun.Application.Web.Controllers string qingJuurl = ConfigurationManager.AppSettings["QingJuurl"]; string qingjuregisterurl = ConfigurationManager.AppSettings["QingJuRegisterurl"]; string defpwd = ConfigurationManager.AppSettings["defaultpwd"]; + //读取默认密码配置中已启用的密码 + if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null) + { + defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd; + } if (up != null && !string.IsNullOrEmpty(up.QUserName)) { if (userinfo.Description == "教师") @@ -424,7 +435,7 @@ namespace Learun.Application.Web.Controllers #region 待办 var userinfo = LoginUserInfo.Get(); - Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + Pagination paginationobj = new Pagination() { rows = 100, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; //未读邮件 ViewBag.UnreadMail = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userinfo.userId + "\"}").Count(m => m.READFLAG == 0); //办公事项 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index 58f0e81e4..72f5425be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -38,6 +38,7 @@ namespace Learun.Application.Web.Controllers private LoginModelIBLL loginModelIbll = new LoginModelBLL(); private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL(); WeChatDevelopIBLL weChatDevelopIbll = new WeChatDevelopBLL(); + private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL(); #endregion #region 视图功能 @@ -184,6 +185,15 @@ namespace Learun.Application.Web.Controllers } //获取错误次数 ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); + //获取初始密码设置中已启用的密码 + ViewBag.IsSetDefaultPwd = false; + ViewBag.DefaultPwd = ""; + var defaultPwdEntity = sys_DefaultPwdConfigIBLL.GetEnabledEntity(); + if (defaultPwdEntity != null) + { + ViewBag.IsSetDefaultPwd = true; + ViewBag.DefaultPwd = defaultPwdEntity.Pwd; + } //获取高职版跳转地址 ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; @@ -499,11 +509,13 @@ namespace Learun.Application.Web.Controllers /// 用户名 /// 密码 /// 验证码 + /// 密码是否是强密码 + /// 密码是否是初始密码，是则需要提示（true） /// [HttpPost] [AjaxOnly] [HandlerValidateAntiForgeryToken] - public ActionResult CheckLogin(string username, string password, string verifycode, string up) + public ActionResult CheckLogin(string username, string password, string verifycode, string up, string defaultPwdTip) { int error = OperatorHelper.Instance.GetCurrentErrorNum(); @@ -521,6 +533,41 @@ namespace Learun.Application.Web.Controllers #region 内部账户验证 UserEntity userEntity = userBll.CheckLogin(username, password); + #region 登录次数限制，禁止登录时间限制 + int defaultForbidLoginNum = 5;//默认的禁止登录次数 + double defaultForbidLoginMinutes = 10;//默认的禁止登录分钟数 + if (!string.IsNullOrEmpty(Config.GetValue("ForbidLoginNum"))) + { + defaultForbidLoginNum = Config.GetValue("ForbidLoginNum").ToInt(); + } + if (!string.IsNullOrEmpty(Config.GetValue("ForbidLoginMinutes"))) + { + defaultForbidLoginMinutes = Config.GetValue("ForbidLoginMinutes").ToDouble(); + } + //错误次数大于等于5时，判断禁止登录时间是否超过10分钟：若是则修改用户的允许登录结束时间，可以登录；若否，禁止登录； + if (error >= defaultForbidLoginNum) + { + if (userEntity.LoginOk)//登录成功 + { + if (userEntity.F_AllowEndTime.HasValue) + { + var period = (DateTime.Now - userEntity.F_AllowEndTime.Value).TotalMinutes; + if (period >= defaultForbidLoginMinutes) + { + userBll.UpdateAllowEndTime(userEntity.F_UserId, 0); + } + else + { + return Fail("错误次数超过" + defaultForbidLoginNum + "次，已被禁止登录，请" + defaultForbidLoginMinutes + "分钟后重试！", error); + } + } + } + else//登录失败 + { + return Fail(userEntity.LoginMsg, error); + } + } + #endregion #region 写入日志 LogEntity logEntity = new LogEntity(); @@ -540,6 +587,11 @@ namespace Learun.Application.Web.Controllers logEntity.F_ExecuteResultJson = "登录失败:" + userEntity.LoginMsg; logEntity.WriteLog(); int num = OperatorHelper.Instance.AddCurrentErrorNum(); + //判断登录错误次数大于等于5，修改用户的允许登录结束时间； + if (num >= defaultForbidLoginNum) + { + userBll.UpdateAllowEndTime(userEntity.F_UserId, 1); + } return Fail(userEntity.LoginMsg, num); } else @@ -552,12 +604,15 @@ namespace Learun.Application.Web.Controllers logEntity.F_ExecuteResultJson = "登录成功"; logEntity.WriteLog(); OperatorHelper.Instance.ClearCurrentErrorNum(); + //修改用户的允许登录结束时间； + userBll.UpdateAllowEndTime(userEntity.F_UserId, 0); //是否强密码验证 if (!string.IsNullOrEmpty(ConfigurationManager.AppSettings["verifypwd"]) && ConfigurationManager.AppSettings["verifypwd"] == "true" && up == "false") { - return Success(new { pwd = true }); + return Success(new { pwd = true, pwdtip = defaultPwdTip == "true" ? true : false }); } - return Success("登录成功"); + //返回成功的数据（pwdtip：初始密码提示弹框；pwd：弱密码修改弹框；） + return Success("登录成功", new { pwdtip = defaultPwdTip == "true" ? true : false }); } #endregion } @@ -739,6 +794,62 @@ namespace Learun.Application.Web.Controllers } } + + + [HttpGet] + public ActionResult CheckLoginForSSOBC(string u) + { + try + { + string publickey = ConfigurationManager.AppSettings["SSOPublicSecret"]; + string userkey = ConfigurationManager.AppSettings["SSOUserSecret"]; + string uid = Request.QueryString["u"]; + if (!string.IsNullOrEmpty(uid)) + { + decimal datetimenow = Convert.ToDecimal(DateTime.Now.ToString("yyyyMMddHHmmss")); + string username = uid; + string password = "www.qj.com"; + UserEntity userEntity = userBll.CheckLogin(username, Md5Helper.Encrypt(password, 32)); + + LogEntity logEntity = new LogEntity(); + logEntity.F_CategoryId = 1; + logEntity.F_OperateTypeId = ((int)OperationType.Login).ToString(); + logEntity.F_OperateType = EnumAttribute.GetDescription(OperationType.Login); + logEntity.F_OperateAccount = username + "(" + userEntity.F_RealName + ")"; + logEntity.F_OperateUserId = !string.IsNullOrEmpty(userEntity.F_UserId) ? userEntity.F_UserId : username; + logEntity.F_Module = "接口登录"; + logEntity.F_Description = "PC端"; + if (!userEntity.LoginOk)//登录失败 + { + //写入日志 + logEntity.F_ExecuteResult = 0; + logEntity.F_ExecuteResultJson = "接口登录失败:" + userEntity.LoginMsg; + logEntity.WriteLog(); + return Fail(userEntity.LoginMsg); + } + else + { + OperatorHelper.Instance.AddLoginUser(userEntity.F_Account, "Learun_ADMS_6.1_PC", null);//写入缓存信息 + //写入日志 + logEntity.F_ExecuteResult = 1; + logEntity.F_ExecuteResultJson = "接口登录成功"; + logEntity.WriteLog(); + var DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; + var Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; + return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"); + } + } + else + { + return Fail("参数错误"); + } + } + catch (Exception e) + { + return Fail("参数错误"); + } + } + #endregion #region 微信登录 @@ -752,9 +863,19 @@ namespace Learun.Application.Web.Controllers string secret = weichatdevelop.secret; ViewBag.login = Request.QueryString["login"]; ViewBag.CODE = Request.QueryString["CODE"]; + //页面来源（source=DragNoLogin为网上办事大厅拖拽版） + ViewBag.source = Request.QueryString["source"]; if (!string.IsNullOrEmpty(ViewBag.login)) { - return Redirect("https://open.weixin.qq.com/connect/qrconnect?appid=" + appid + "&redirect_uri=" + redirect_url + "%2fLogin%2fLoginForWeixin&response_type=code&scope=snsapi_login&state=one#wechat_redirect"); + if (ViewBag.source == "DragNoLogin") + { + var aa = HttpUtility.UrlEncode("/Login/LoginForWeixin?source=" + ViewBag.source); + return Redirect("https://open.weixin.qq.com/connect/qrconnect?appid=" + appid + "&redirect_uri=" + redirect_url + aa + "&response_type=code&scope=snsapi_login&state=one#wechat_redirect"); + } + else + { + return Redirect("https://open.weixin.qq.com/connect/qrconnect?appid=" + appid + "&redirect_uri=" + redirect_url + "%2fLogin%2fLoginForWeixin&response_type=code&scope=snsapi_login&state=one#wechat_redirect"); + } } else { @@ -772,6 +893,8 @@ namespace Learun.Application.Web.Controllers public ActionResult DoWeixinLogin() { string openId = Request["openId"]; + //页面来源（source=DragNoLogin为网上办事大厅拖拽版） + string source = Request["source"]; var userEntity = userBll.GetEntityByWeixinOpenIdPC(openId); if (userEntity != null) { @@ -794,7 +917,7 @@ namespace Learun.Application.Web.Controllers } else { - return Success("帐号还未关联，请先关联帐号", new { returnurl = "/Login/RegisterBind?WeixinOpenId=" + openId + "" }); + return Success("帐号还未关联，请先关联帐号", new { returnurl = "/Login/RegisterBind?WeixinOpenId=" + openId + "&source=" + source + "" }); } } @@ -802,6 +925,8 @@ namespace Learun.Application.Web.Controllers { string QQOpenId = Request["QQOpenId"]; string WeixinOpenId = Request["WeixinOpenId"]; + //页面来源（source=DragNoLogin为网上办事大厅拖拽版） + string source = Request["source"]; ViewBag.WeixinOpenId = WeixinOpenId; ViewBag.QQOpenId = QQOpenId; @@ -820,6 +945,11 @@ namespace Learun.Application.Web.Controllers ViewBag.Ip = GetIP(); ViewBag.ACIp = ConfigurationManager.AppSettings["ACIp"] ?? ""; ViewBag.ACIp2 = ConfigurationManager.AppSettings["ACIp2"] ?? ""; + //判断页面来源 + if (source == "DragNoLogin") + { + return Redirect("/SSOSystem/DragNoWxLogin?QQOpenId=" + QQOpenId + "&WeixinOpenId=" + WeixinOpenId + ""); + } //获取登录页风格 var pageEntity = loginModelIbll.FindEnablePage(); if (pageEntity == null) @@ -899,8 +1029,8 @@ namespace Learun.Application.Web.Controllers { string appid = "76d40062-349f-486d-b871-35bed08d2f59"; string secret = "cgpi"; - string appkey =Request.QueryString["appkey"]; - string response = Util.HttpMethods.HttpGet("http://localhost:20472/SSOSystem/authorize?appid=" + appid + "&secret=" + secret + "&appkey="+ appkey); + string appkey = Request.QueryString["appkey"]; + string response = Util.HttpMethods.HttpGet("http://localhost:20472/SSOSystem/authorize?appid=" + appid + "&secret=" + secret + "&appkey=" + appkey); return Content(response); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index c7f7ea87f..e6dd2a1b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -16,6 +16,8 @@ using System.Web.Mvc; using Learun.Cache.Base; using Learun.Cache.Factory; using Newtonsoft.Json; +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Application.TwoDevelopment.PersonnelManagement; namespace Learun.Application.Web.Controllers { @@ -37,6 +39,23 @@ namespace Learun.Application.Web.Controllers private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL(); private Perm_FunctionVisitIBLL functionVisitIbll = new Perm_FunctionVisitBLL(); private ICache redisCache = CacheFactory.CaChe(); + private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL(); + private SYS_SendMessageIBLL sYS_SendMessageIBLL = new SYS_SendMessageBLL(); + private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); + private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL(); + private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); + private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL(); + private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL(); + private CdLessonSortIBLL cdLessonSortIBLL = new CdLessonSortBLL(); + private CdLessonTypeIBLL cdLessonTypeIBLL = new CdLessonTypeBLL(); + private BCdCultureDegreeIBLL bCdCultureDegreeIBLL = new BCdCultureDegreeBLL(); + private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL(); + private Sys_QRCodeInLoginIBLL sys_QRCodeInLoginIBLL = new Sys_QRCodeInLoginBLL(); + private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); + private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); + private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); #region 统一身份认证2.0 /// @@ -840,5 +859,961 @@ namespace Learun.Application.Web.Controllers return ip; } + /// + /// 网上办事大厅拖拽版-未登录页面 + /// + /// + public ActionResult DragNoLogin() + { + //获取错误次数 + ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); + //获取高职版跳转地址 + ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; + ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; + //获取登录页二维码配置信息 + ViewBag.HasQRCode = false; + var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime); + if (qrcodelist.Any()) + { + ViewBag.HasQRCode = true; + ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl; + ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title; + } + //微信快捷登录 + var result4 = teachSwitchIBLL.FindFirst("wxloginforpc"); + ViewBag.WeixinLoginSwitch = result4; + + + return View(); + } + + /// + /// 网上办事大厅拖拽版-未登录页面-微信登录 + /// + /// + public ActionResult DragNoWxLogin() + { + string QQOpenId = Request.QueryString["QQOpenId"]; + string WeixinOpenId = Request.QueryString["WeixinOpenId"]; + ViewBag.WeixinOpenId = WeixinOpenId; + ViewBag.QQOpenId = QQOpenId; + + //获取错误次数 + ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); + //获取高职版跳转地址 + ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; + ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; + //获取登录页二维码配置信息 + ViewBag.HasQRCode = false; + var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime); + if (qrcodelist.Any()) + { + ViewBag.HasQRCode = true; + ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl; + ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title; + } + + + return View(); + } + /// + /// 网上办事大厅拖拽版-办事大厅模式 + /// + /// + public ActionResult DragModelOne() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //桌面管理表、卡片块排序管理表增加默认数据 + sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "one"); + //获取桌面、卡片块排序列表 + ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "one").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate); + ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList); + //分页查询条件设置 + Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + //邮件-收件箱 + var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMail = maildata; + ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail); + ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0); + //邮件-已发送 + paginationobj.sidx = "SENDTIME desc"; + var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMailSend = mailsenddata; + ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend); + //来往邮件数量 + ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count(); + //公文 + paginationobj.sidx = "SendTime"; + ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}"); + ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); + //公告 + List outnewslist = new List(); + var newsList = newsIBLL.GetList("", userInfo.userId); + foreach (var newsitemEntity in newsList) + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) + { + if (!string.IsNullOrEmpty(userInfo.postIds)) + { + if (userInfo.postIds.Contains(",")) + { + foreach (var postid in userInfo.postIds.Split(',')) + { + if (newsitemEntity.F_SendPostId.Contains(postid)) + { + outnewslist.Add(newsitemEntity); + break; + } + } + } + else + { + if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) + { + outnewslist.Add(newsitemEntity); + } + } + } + } + else + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) + { + if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) + { + outnewslist.Add(newsitemEntity); + } + } + else + { + outnewslist.Add(newsitemEntity); + } + } + } + ViewBag.NewsList = outnewslist.Take(5); + ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); + //宣传报道 + var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4); + foreach (var item in newsListOfxuanchuan) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan; + ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan); + //智慧教育 + ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6); + ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui); + //专题推荐 + var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7); + foreach (var item in newsListOfzhuanti) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfzhuanti = newsListOfzhuanti; + ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti); + //办公事项-待办任务 + paginationobj.sidx = "F_CreateDate"; + paginationobj.rows = 4; + var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}"); + ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList); + ViewBag.TaskTotalNum = taskListAll.Count(); + //办公事项-已办任务 + var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}"); + ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList); + ViewBag.FinishTaskTotalNum = finishTaskListAll.Count(); + //办公事项-我发起的 + var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}"); + ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}"); + ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList); + ViewBag.MyListTotalNum = myListAll.Count(); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + + + return View(); + } + + /// + /// 网上办事大厅拖拽版-效率优先模式 + /// + /// + public ActionResult DragModelTwo() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //桌面管理表、卡片块排序管理表增加默认数据 + sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "two"); + //获取桌面、卡片块排序列表 + ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "two").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate); + ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList); + //分页查询条件设置 + Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + //邮件-收件箱 + var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMail = maildata; + ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail); + ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0); + //邮件-已发送 + paginationobj.sidx = "SENDTIME desc"; + var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMailSend = mailsenddata; + ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend); + //来往邮件数量 + ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count(); + //公文 + paginationobj.sidx = "SendTime"; + ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}"); + ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); + //公告 + List outnewslist = new List(); + var newsList = newsIBLL.GetList("", userInfo.userId); + foreach (var newsitemEntity in newsList) + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) + { + if (!string.IsNullOrEmpty(userInfo.postIds)) + { + if (userInfo.postIds.Contains(",")) + { + foreach (var postid in userInfo.postIds.Split(',')) + { + if (newsitemEntity.F_SendPostId.Contains(postid)) + { + outnewslist.Add(newsitemEntity); + break; + } + } + } + else + { + if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) + { + outnewslist.Add(newsitemEntity); + } + } + } + } + else + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) + { + if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) + { + outnewslist.Add(newsitemEntity); + } + } + else + { + outnewslist.Add(newsitemEntity); + } + } + } + ViewBag.NewsList = outnewslist.Take(5); + ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); + //宣传报道 + var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4); + foreach (var item in newsListOfxuanchuan) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan; + ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan); + //智慧教育 + ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6); + ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui); + //专题推荐 + var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7); + foreach (var item in newsListOfzhuanti) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfzhuanti = newsListOfzhuanti; + ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti); + //办公事项-待办任务 + paginationobj.sidx = "F_CreateDate"; + paginationobj.rows = 4; + var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}"); + ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList); + ViewBag.TaskTotalNum = taskListAll.Count(); + //办公事项-已办任务 + var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}"); + ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList); + ViewBag.FinishTaskTotalNum = finishTaskListAll.Count(); + //办公事项-我发起的 + var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}"); + ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}"); + ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList); + ViewBag.MyListTotalNum = myListAll.Count(); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); + //todo: + //删begin + ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教")); + ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理")); + ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6); + ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao); + ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan); + ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused); + //删end + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + + + return View(); + } + /// + /// 网上办事大厅拖拽版-管理驾驶舱模式 + /// + /// + public ActionResult DragModelThree() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + ViewBag.StuInfoTotalNumOfMan = stuInfoData.Where(x => x.GenderNo == true).Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + ViewBag.TeacherTotalNumOfMan = teacherData.Where(x => x.GenderNo == true).Count(); + ViewBag.TeacherTotalNumOfBianNei = teacherData.Where(x => x.CompilationCategory == "01").Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //课程总览 + var lessonInfoData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonInfoData.Count(); + ViewBag.OpenLessonTotalNum = lessonInfoData.Where(x => x.CheckMark == true).Count(); + //课程分类下的课程 + var lessonBySort = lessonInfoData.GroupBy(x => x.LessonSortNo).Select(x => new + { + value = x.Select(y => y.LessonId).Count(), + name = cdLessonSortIBLL.GetCdLessonSortEntityByNo(x.Key)?.LessonSortName + }); + ViewBag.LessonBySortStr = JsonConvert.SerializeObject(lessonBySort); + //课程类型下的课程 + var lessonByType = lessonInfoData.GroupBy(x => x.LessonTypeId).Select(x => new + { + value = x.Select(y => y.LessonId).Count(), + name = cdLessonTypeIBLL.GetCdLessonTypeEntity(x.Key)?.LessonTypeName + }); + ViewBag.LessonByTypeStr = JsonConvert.SerializeObject(lessonByType); + //教师总览 + //教师学历比例 + var teacherByHighestRecord = teacherData.Where(x => !string.IsNullOrEmpty(x.HighestRecord)).GroupBy(x => x.HighestRecord).Select(x => new + { + value = x.Select(y => y.EmpId).Count(), + name = bCdCultureDegreeIBLL.GetEntity(x.Key)?.CultureDegree + }).OrderByDescending(x => x.value); + ViewBag.TeacherByHighestRecordStr = JsonConvert.SerializeObject(teacherByHighestRecord); + //教师年龄比例 + var empInfoAgeRate = empInfoIBLL.GetEmpInfoAgeRate(); + var teacherByAge = new List() { + new { value = empInfoAgeRate.age1, name = "60岁以上" }, + new { value = empInfoAgeRate.age2, name = "50~60岁" }, + new { value = empInfoAgeRate.age3, name = "40~50岁" }, + new { value = empInfoAgeRate.age4, name = "30~40岁" }, + new { value = empInfoAgeRate.age5, name = "20~30岁" }, + }; + ViewBag.TeacherByAgeStr = JsonConvert.SerializeObject(teacherByAge); + //学生总览 + //学生成绩预警 + var stuScoreData = stuScoreNotPassIBLL.GetList("{}").Where(x => x.Score == 0).Select(x => new { x.StuNo, x.MajorNo }).Distinct(); + ViewBag.StuScoreWarnTotalNum = stuScoreData.Count(); + var stuScoreByMajor = stuScoreData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuNo).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + + + return View(); + } + /// + /// 网上办事大厅拖拽版-保存卡片块排序 + /// + /// + public ActionResult SaveCardSort(string userId, string modelCode, string desktopId, string cardSort) + { + sSO_Drag_CardSortManageIBLL.SaveCardSort(userId, modelCode, desktopId, cardSort); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-新增桌面 + /// + /// + public ActionResult AddDesktop(string userId, string modelCode, string desktopName, string desktopCode) + { + sSO_Drag_DesktopManageIBLL.AddDesktop(userId, modelCode, desktopName, desktopCode); + var data = sSO_Drag_DesktopManageIBLL.GetEntityByDesktopCode(userId, modelCode, desktopCode); + return Success("操作成功", data); + } + + /// + /// 网上办事大厅拖拽版-删除桌面 + /// + /// + public ActionResult DeleteDesktop(string desktopId) + { + sSO_Drag_DesktopManageIBLL.DeleteEntity(desktopId); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-修改桌面 + /// + /// + public ActionResult ModifyDesktop(string desktopId, string desktopName) + { + var entity = new SSO_Drag_DesktopManageEntity() + { + DesktopName = desktopName + }; + sSO_Drag_DesktopManageIBLL.SaveEntity(desktopId, entity); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-默认桌面恢复默认设置 + /// + /// + public ActionResult RestoreDefaultDesktop(string desktopId) + { + sSO_Drag_DesktopManageIBLL.RestoreDefaultDesktop(desktopId); + return Success("操作成功"); + } + } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 5e97a1398..95a697197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -284,6 +284,7 @@ + @@ -472,6 +473,7 @@ + @@ -795,6 +797,11 @@ + + + + + @@ -811,6 +818,14 @@ + + + + + + + + @@ -1266,8 +1281,11 @@ + + + @@ -1275,6 +1293,7 @@ + @@ -1319,6 +1338,7 @@ + @@ -1329,6 +1349,7 @@ + @@ -1345,9 +1366,15 @@ + + + + + + @@ -1377,6 +1404,14 @@ + + + + + + + + @@ -1699,6 +1734,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2825,6 +3008,14 @@ + + + + + + + + @@ -6135,6 +6326,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6908,11 +7119,29 @@ + + + + + + + + + + + + + + + + + - - - + + + + @@ -6983,6 +7212,12 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml index 8326a0c94..6f8380344 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml @@ -3,6 +3,12 @@ Layout = "~/Views/Shared/_Admin.cshtml"; } @Html.AppendCssFile("/Views/Home/AdminAccordion/index.css") +
    @@ -63,8 +69,15 @@
    + @Html.AppendJsFile("/Views/Home/AdminAccordion/index.js") +@Html.AppendJsFile("/Views/Login/ACLogon.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js index 05c07fee1..715b439e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js @@ -6,7 +6,9 @@ * 描 述：经典风格皮肤 */ var autoopenid = request('autoopen'); -var pwd = request("pwd"); +var pwd = request("pwd");//弱密码修改弹框 +var pwdtip = request("pwdtip");//初始密码提示弹框 +var pwdpwdtip = request("pwdpwdtip");//弱密码修改弹框&初始密码提示弹框 var bootstrap = function ($, learun) { "use strict"; // 菜单操作 @@ -197,7 +199,8 @@ var bootstrap = function ($, learun) { // area: ['500px', '300px'] // }); //} - if (pwd == "true") { + //弱密码修改弹框 + if (pwd == "true" || pwdpwdtip == "true") { top.layer.open({ id: 'pwdform', title: '密码修改', @@ -225,6 +228,10 @@ var bootstrap = function ($, learun) { } }); } + //初始密码提示弹框 + if (pwdtip == "true" || pwdpwdtip == "true") { + learun.layerConfirm('当前登录密码还是初始密码！', function (res) { }); + } //上网认证 if (ACIp != null && ACIp != "") { //Ip上网 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktopTop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktopTop.cshtml index 4993ddef0..06d402508 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktopTop.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktopTop.cshtml @@ -314,7 +314,7 @@ .lr-scroll-wrap { position: relative; overflow: hidden; - height: 100%; + height: 70%; width: 100% } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml index 5d43efa91..8742ff87c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml @@ -63,5 +63,12 @@ + @Html.AppendJsFile("/Views/Home/AdminTop/index.js") +@Html.AppendJsFile("/Views/Login/ACLogon.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml index 450360630..83b40e217 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml @@ -70,5 +70,12 @@ + @Html.AppendJsFile("/Views/Home/AdminWindos/index.js") +@Html.AppendJsFile("/Views/Login/ACLogon.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css index 6534bed3e..269576e53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timeline.css @@ -13,6 +13,7 @@ padding:10px; background-color:#f0f3f4; color:#58666e; + overflow: auto; } .lr-timeline ul { padding: 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js index 78746c499..0c2809e82 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js @@ -4,14 +4,14 @@ learun._im = { init: function () { - learun._im.registerServer(); - learun._im.connect(); + //learun._im.registerServer(); + //learun._im.connect(); } // 连接服务端 , connect: function () { var loginInfo = learun.clientdata.get(['userinfo']); if (loginInfo.imOpen != 'true') { - setTimeout(learun._im.connect, 10000); + setTimeout(learun._im.connect, 60000); } $.ajax({ @@ -49,7 +49,7 @@ }); } if (!learun.imChat) { - setTimeout(learun._im.connect, 1000); + setTimeout(learun._im.connect, 60000); } // 连接成功后注册服务器方法 $.connection.hub.start().done(function () { @@ -69,7 +69,7 @@ $(function() { - learun._im.connect(); + //learun._im.connect(); }) })(jQuery, top.learun); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml index ddb0c4cb8..b33ad628c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml @@ -49,6 +49,8 @@ + +