diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html index 5a012080a..85355335d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html @@ -1,5 +1,5 @@ 
-
+ +
@@ -74,7 +74,7 @@
-
+
-
+
\ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js index 861937092..eb7cb7caa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js @@ -19,7 +19,6 @@ data: { 'account': account }, async: false, success: function (msg) { - console.log(msg); if (msg.data) { keyValue = msg.data.StuId; } else { @@ -151,40 +150,40 @@ } }, bind: function ($page, param) { - $page.find('#Birthday').lrdate({ - type: 'date' - }); - $page.find('#PartyFaceNo').lrpickerex({ - code: 'BCdPartyFace', - type: 'sourceData', - ivalue: 'partyfaceno', - itext: 'partyface' - }); - $page.find('#NationalityNo').lrpickerex({ - code: 'National', - type: 'dataItem' - }); + //$page.find('#Birthday').lrdate({ + // type: 'date' + //}); + //$page.find('#PartyFaceNo').lrpickerex({ + // code: 'BCdPartyFace', + // type: 'sourceData', + // ivalue: 'partyfaceno', + // itext: 'partyface' + //}); + //$page.find('#NationalityNo').lrpickerex({ + // code: 'National', + // type: 'dataItem' + //}); $page.find('#ResidenceNo').lrpickerex({ code: 'ResidenceNo', type: 'dataItem' }); - $page.find('#Photo').imagepicker(); - $page.find('#FamilyOriginNo').lrpickerex({ - type: 'sourceData', - code: 'BCdFamilyOrigin', - ivalue: 'familyoriginno', - itext: 'familyorigin' - }); - $page.find('#OverseasChineseNo').lrpickerex({ - type: 'sourceData', - code: 'BCdOverseasChinese', - ivalue: 'overseaschineseno', - itext: 'overseaschinesename' - }); - $page.find('#GraduateNo').lrpickerex({ - code: 'CollegeType', - type: 'dataItem' - }); + //$page.find('#Photo').imagepicker(); + //$page.find('#FamilyOriginNo').lrpickerex({ + // type: 'sourceData', + // code: 'BCdFamilyOrigin', + // ivalue: 'familyoriginno', + // itext: 'familyorigin' + //}); + //$page.find('#OverseasChineseNo').lrpickerex({ + // type: 'sourceData', + // code: 'BCdOverseasChinese', + // ivalue: 'overseaschineseno', + // itext: 'overseaschinesename' + //}); + //$page.find('#GraduateNo').lrpickerex({ + // code: 'CollegeType', + // type: 'dataItem' + //}); }, destroy: function (pageinfo) { $header = null; keyValue = ''; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.html new file mode 100644 index 000000000..8e97c5c9e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.html @@ -0,0 +1,34 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.js new file mode 100644 index 000000000..b15bd2b9b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Result/Result.js @@ -0,0 +1,174 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-16 15:52 + * 描 述：班级自诊打卡结果 + */ +(function () { + var begin = ''; + var end = ''; + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + begin = ''; + end = ''; + multipleData = null; + page.grid = $page.find('#lr_EducationalAdministrationThermography_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(); + } + }); + $multiple.find('#ClassNo').lrpickerex({ + type: 'sourceData', + code: 'bjsj', + ivalue: 'classno', + itext: 'classname' + }); + $multiple.find('#PersonBeingMeasured').lrpickerex({ + type: 'sourceData', + code: 'StuInfoBasic', + ivalue: 'stuno', + itext: 'stuname' + }); + $multiple.find('#Status').lrpickerex({ + type: 'dataItem', + code: 'TemperatureMeasure' + }); + $multiple.find('#MeasureTime').lrpickerex({ + type: 'dataItem', + code: 'MeasureTime' + }); + $page.find('#lr_EducationalAdministrationThermography_btn').on('tap', function () { + learun.nav.go({ path: 'EducationalAdministration/Thermography/form', title: '新增', type: 'right' }); + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page, + sidx: 'MeasureDate desc,PersonBeingMeasured', + sord: 'DESC' + }, + queryJson: '{}' + }; + if (param.multipleData) { + _postParam.queryJson = JSON.stringify(multipleData); + } + if (param.begin && param.end) { + _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end }); + } + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Thermography/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.ClassNo, + type: 'dataSource', + code: 'bjsj', + keyId: 'classno', + text: 'classname' + })); + _$item.append($('

测温人:

').dataFormatter({ + value: _item.MeasurerID, + type: 'dataSource', + code: 'BaseUser', + keyId: 'f_account', + text: 'f_realname' + })); + _$item.append($('

被测温人学号:

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

被测温人:

').dataFormatter({ + value: _item.PersonBeingMeasured, + type: 'dataSource', + code: 'BaseUser', + keyId: 'f_account', + text: 'f_realname' + })); + _$item.append($('

状态:

').dataFormatter({ + value: _item.Status, + type: 'dataItem', + code: 'TemperatureMeasure' + })); + _$item.append($('

温度:

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

处理结果:

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

备注:

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

测量时间:

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

测量时间段:

').dataFormatter({ + value: _item.MeasureTime, + type: 'dataItem', + code: 'MeasureTime' + })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + learun.nav.go({ path: 'EducationalAdministration/Thermography/form', title: '详情', type: 'right', param: { keyValue: item.ID } }); + }, + btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在删除该笔数据'); + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Thermography/delete', item.ID, (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/Thermography/Thermography.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js index 754315bea..fef143a77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js @@ -84,7 +84,7 @@ pagination: { rows: param.rows, page: param.page, - sidx: 'MeasureDate', + sidx: 'MeasureDate desc,PersonBeingMeasured', sord: 'DESC' }, queryJson: JSON.stringify({ MeasurerID: learun.storage.get('userinfo').baseinfo.account }) 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 8ef6f50ab..8db6708d1 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 @@ -202,7 +202,7 @@ li { border-color: #cacaca !important; } */ -.timeTableBtn { +.timeTableBtn,.submitBtn { font-size: 16px; margin: 20px 12px; background: #0C86D8; @@ -211,6 +211,7 @@ li { line-height: 40px; height: 40px; color: #fff; + cursor:pointer; } .statusType { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html index f81c12eb3..2e36f2471 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html @@ -27,6 +27,7 @@
    +
    提交测温
    @@ -42,8 +43,8 @@
    * - - + +
    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 559104786..56d3741ca 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 @@ -11,15 +11,16 @@ change: function (value, text, datalist, $self) { loadData($page, param); } - }).lrpickerSet(0); + }).lrpickerSet(-1); //状态 $page.find('#Status').lrpickerex({ code: 'TemperatureMeasure', type: 'dataItem' }).lrpickerSet(1); //初始化 - setTimeout(function () { + var timer = setTimeout(function () { loadData($page, param); + clearTimeout(timer); }, 1000); //选择学生 @@ -51,7 +52,42 @@ $('.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 () { // 获取表单数据 @@ -64,28 +100,41 @@ 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); + timeTableAlertFn(); + }); + + //提交测温按钮：整个班级提交测温 + $page.find(".submitBtn").on('tap', + function () { + var dataArray = new Array(); + $.each($page.find('.timeTableList').find('li'), function (i, item) { + var dataItem = JSON.parse($(item).attr('student')); + dataArray.push(dataItem); + }); learun.layer.confirm('是否确认提交测温？', function (_index) { if (_index === '1') { learun.layer.loading(true, '正在提交'); learun.httppost( - config.webapi + '/learun/adms/EducationalAdministration/Thermography/save', + config.webapi + '/learun/adms/EducationalAdministration/Thermography/save2', { - keyValue: data.ID, - strEntity: JSON.stringify(data) + measureTime: $page.find('#MeasureTime').lrpickerGet(), + strEntity: JSON.stringify(dataArray) }, (data) => { learun.layer.loading(false); if (data) { learun.layer.toast("提交成功"); - timeTableAlertFn(); loadData($page, param); } }); } }); - }); + }); } }; @@ -109,11 +158,13 @@ var className = ''; if (weekData2.length == 0) { html = '
  • 暂时没有信息
    • ' + $('.submitBtn').hide(); } else { + $('.submitBtn').show(); className = weekData2[0].ClassName; $.each(weekData2, function (j, k) { var statusName = !k.Status ? 'sStatue1' : k.Status == "0" ? 'sStatue1' : k.Status == "1" ? 'sStatue2' : 'sStatue3'; - html += '
  • ' + + html += '
  • ' + k.PersonBeingMeasuredName + '' + '
    • '; }); 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 ab4912983..3cef3e612 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 @@ -2,7 +2,7 @@
    -
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js index 7a12c3612..e2452f194 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js @@ -20,7 +20,7 @@ } var path = config.webapi; - learun.http.get(path + "Learun/EducationalAdministration/EmpRegister/registerbutton", + learun.http.get(path + "Learun/adms/EducationalAdministration/EmpRegister/registerbutton", {}, (res) => { if (res.info == "True") { var button = $page.find('#RegisterBtn'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs new file mode 100644 index 000000000..5039cdcf7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs @@ -0,0 +1,117 @@ +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 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainController : MvcControllerBase + { + private EATalentTrainIBLL eATalentTrainIBLL = new EATalentTrainBLL(); + + #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 = eATalentTrainIBLL.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 EATalentTrainData = eATalentTrainIBLL.GetEATalentTrainEntity( keyValue ); + var jsonData = new { + EATalentTrain = EATalentTrainData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + eATalentTrainIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + EATalentTrainEntity entity = strEntity.ToObject(); + eATalentTrainIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs index c802bf5ba..bf96c0471 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs @@ -58,6 +58,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 班级自诊打开结果 + /// + /// + [HttpGet] + public ActionResult IndexResult() + { + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml new file mode 100644 index 000000000..a33de37dd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "人才培养方案"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    学年*
    +
    +
    +
    +
    学期*
    +
    +
    +
    +
    系部*
    +
    +
    +
    +
    专业*
    +
    +
    +
    +
    入学要求
    + +
    +
    +
    修业年限
    + +
    +
    +
    培训方案
    +
    +
    +
    +
    备注
    + +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js new file mode 100644 index 000000000..04f08fea7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js @@ -0,0 +1,85 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-12-17 14:29 + * 描 述：人才培养方案 + */ +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 () { + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "CheckMark=1" } + }); + } + } + }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); + $('#ProgramFile').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/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/EATalentTrain/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml new file mode 100644 index 000000000..c1fd02e6d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml @@ -0,0 +1,48 @@ +@{ + ViewBag.Title = "人才培养方案"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    学年
    +
    +
    +
    +
    学期
    +
    +
    +
    +
    系部
    +
    +
    +
    +
    专业
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js new file mode 100644 index 000000000..ecdee2cd8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js @@ -0,0 +1,150 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-12-17 14:29 + * 描 述：人才培养方案 + */ +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); + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "CheckMark=1" } + }); + } + } + }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/Form', + width: 800, + height: 600, + 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/EATalentTrain/Form?keyValue=' + keyValue, + width: 800, + height: 600, + 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/EATalentTrain/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/GetPageList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { + 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: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { label: "入学要求", name: "EntranceRequire", width: 150, align: "left" }, + { label: "修业年限", name: "YearLimit", width: 100, 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/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 1bd11e5ed..f8c885a1e 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 @@ -51,8 +51,12 @@
    -
    文化程度
    -
    +
    最高学历
    +
    +
    +
    +
    是否审核
    +
    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 20578acca..a5487d379 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 @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 250, 400); + }, 280, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', @@ -49,14 +49,16 @@ var bootstrap = function ($, learun) { $('#RegionNo').lrselect(); //政治面貌 $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - //文化程度 - $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); + //最高学历 + $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); //民族 $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); //性别 $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + //是否审核 + $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); //职称 @@ -412,7 +414,7 @@ var bootstrap = function ($, learun) { { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { - label: "文化程度", name: "CultureDegreeNo", width: 100, align: "left", + label: "最高学历", name: "HighestRecord", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml index 7d68759cc..621bf8e9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml @@ -34,6 +34,10 @@
    班级
    +
    +
    选修课程
    +
    +
    选课状态
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index c791970b2..c5f5bb8cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -24,7 +24,7 @@ var bootstrap = function ($, learun) { return; } page.search(queryJson); - }, 250, 400); + }, 300, 400); $('#AcademicYearNo').lrselect({ placeholder: "请选择学年", allowSearch: true, @@ -46,6 +46,13 @@ var bootstrap = function ($, learun) { $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#LessonNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=LessonInfo', + param: { strWhere: "1=1 AND LessonSortNo='2' " }, + value: "lessonno", + text: "lessonname" + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -174,11 +181,12 @@ var bootstrap = function ($, learun) { { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { - if (cellvalue != "") { - if (cellvalue.indexOf(',') == -1) + if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { + if (cellvalue.indexOf(',') == -1) { return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; - else + } else { return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } } } }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js index 3c374b2c2..d9aed5d45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js @@ -236,7 +236,16 @@ var bootstrap = function ($, learun) { key: value, code: 'TemperatureMeasure', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常") { + callback('' + _data.text + ''); + } else if (_data.text == "异常") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } @@ -260,7 +269,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, - sidx: 'MeasureDate', + sidx: 'MeasureDate desc,PersonBeingMeasured', sord: 'desc' }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml new file mode 100644 index 000000000..7085627a6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml @@ -0,0 +1,54 @@ +@{ + ViewBag.Title = "班级自诊打卡结果"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    系部
    +
    +
    +
    +
    专业
    +
    +
    +
    +
    班级
    +
    +
    +
    +
    被测温人
    +
    +
    +
    +
    状态
    +
    +
    +
    +
    测温时间段
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Thermography/IndexResult.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js new file mode 100644 index 000000000..b29544089 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js @@ -0,0 +1,226 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-16 15:52 + * 描 述：班级自诊打卡结果 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + + page.initGird(); + 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, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 300, 400); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, + text: "ClassName", + value: "ClassNo" + }) + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname', select: function (val) { + var classNo = ''; + if (val) { + classNo = val.ClassNo; + } + $('#PersonBeingMeasured').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoByClassNo?classNo=' + classNo, + text: "StuName", + value: "StuNo" + }) + } + }); + $('#PersonBeingMeasured').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#Status').lrDataItemSelect({ code: 'TemperatureMeasure' }); + $('#MeasureTime').lrDataItemSelect({ code: 'MeasureTime' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetPageList', + headData: [ + { + 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: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "测温人", name: "MeasurerID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "被测温人学号", name: "PersonBeingMeasured", width: 100, align: "left" + }, + { + label: "被测温人", name: "PersonBeingMeasuredName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: row.PersonBeingMeasured, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "状态", name: "Status", width: 80, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'TemperatureMeasure', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常") { + callback('' + _data.text + ''); + } else if (_data.text == "异常") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: "温度", name: "Temperature", width: 100, align: "left" }, + { label: "处理结果", name: "ProcessingResult", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { label: "测量时间", name: "MeasureDate", width: 120, align: "left" }, + { + label: "测量时间段", name: "MeasureTime", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'MeasureTime', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + ], + mainId: 'ID', + isPage: true, + sidx: 'MeasureDate desc,PersonBeingMeasured', + sord: 'desc' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.cshtml index 2c59a50da..c543232f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.cshtml @@ -14,9 +14,10 @@
    -  提交上午测温 + @* 提交上午测温  提交中午测温 -  提交晚上测温 +  提交晚上测温*@ +  提交测温
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.js index ebb135529..4cabe281f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/SubmitIndex.js @@ -69,6 +69,19 @@ var bootstrap = function ($, learun) { } }); + //提交测温 + $('#lr_submit').on('click', function () { + var datas = $('#gridtable').jfGridGet('rowdatas'); + if (datas.length > 0) { + learun.layerConfirm('是否确认提交测温！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Thermography/DoSave', { measureTime: '-1', rowdatas: JSON.stringify(datas) }, function () { + refreshGirdData(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml index c2f4b8818..10d01d354 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml @@ -7,28 +7,6 @@
    -
    -
    -
    -
    -
    填表人员
    - -
    -
    -
    类别
    -
    -
    -
    -
    身份证号
    - -
    -
    -
    单位名称
    - -
    -
    -
    -
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml index cd5f06fdf..19d677a58 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml @@ -12,19 +12,15 @@
    填表人员
    - +
    类别
    -
    身份证号
    - -
    -
    -
    单位名称
    - +
    系|专业|班级
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js index 89963173f..a40972104 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js @@ -5,6 +5,7 @@ * 描 述：疫情记录 */ var refreshGirdData; +var startTime, endTime; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -13,10 +14,13 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); $('#Type').lrDataItemSelect({ code: 'EUserType' }); + $('#Creater').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -55,12 +59,6 @@ var bootstrap = function ($, learun) { } }, - { - label: "填报日期", name: "CreateTime", width: 100, align: "left", - formatter: function (value, row) { - return dateFormat("YYYY-mm-dd", new Date(value)); - } - }, { label: "类别", name: "Type", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { 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 704ee261f..1a7577104 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 @@ -792,6 +792,7 @@ + @@ -1015,6 +1016,7 @@ + @@ -6123,6 +6125,10 @@ + + + + @@ -6888,6 +6894,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml index 4472c6df9..1ae339f7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml @@ -21,10 +21,6 @@
    -
    - 版本号 : @if (ViewBag.Version) - { - @ViewBag.errornum - }       在线用户人数 : @ViewBag.OnlineUserNum 人 +
    在线用户人数 : @ViewBag.OnlineUserNum 人
    北京金隅科技学校       智慧校园 版权所有
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml index 9bb27a26b..6e25e93b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml @@ -21,10 +21,6 @@