From 0b0e2323c849ae0f2ed7dc7c31e31b1a4e7b3469 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Fri, 25 Sep 2020 10:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=8A=A5=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=95=99=E5=AE=A4=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=A6Learun=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www/config/config.js | 16 ++++---- .../Ass_InventoryItemList.js | 2 +- .../Ass_InventoryItemList/Form/form.js | 2 +- .../Ass_InventoryList/Ass_InventoryList.js | 2 +- .../www/pages/BookBorrow/BookBorrow.js | 2 +- .../EmpRegister/EmpRegister.js | 2 +- .../R_EnterBuilding/form/form.js | 4 +- .../R_EnterSchool/form/form.js | 4 +- .../SYS_ReceiveMessage/SYS_ReceiveMessage.js | 2 +- .../SchoolCalendar/SchoolCalendar.js | 2 +- .../SchoolCalendar/form/form.js | 4 +- .../StuAttendanceLeave/StuAttendanceLeave.js | 2 +- .../StuAttendanceLeave/form/form.js | 2 +- .../StuConsumption/StuConsumption.js | 2 +- .../StuConsumption/form/form.js | 4 +- .../StuInfoBasic/form/form.js | 2 +- .../StuInfoFresh/PayFee/PayFee.js | 2 +- .../StuInfoFresh/PayFee/form/form.js | 4 +- .../RegisterQRCode/RegisterQRCode.html | 4 ++ .../StuMail/StuMail.js | 2 +- .../StuMail/form/form.js | 4 +- .../Sys_ReceiveFile/Sys_ReceiveFile.js | 2 +- .../Sys_ReceiveFile/form/form.js | 4 +- .../TeachPlan/TeachPlan.js | 2 +- .../TeachPlan/form/form.js | 4 +- .../Thermography/Thermography.js | 2 +- .../Thermography/form/form.js | 4 +- .../www/pages/LR_OAModule/Notice/Notice.js | 2 +- .../ListenClassRecord/ListenClassRecord.js | 2 +- .../ListenClassRecord/form/form.js | 4 +- .../ActivitySchedule/ActivitySchedule.js | 2 +- .../ActivitySchedule/form/form.js | 4 +- .../ClassWork/ClassWork.js | 2 +- .../ClassWork/form/form.js | 4 +- .../CommunityInfo/CommunityInfo.js | 4 +- .../CommunityInfo/form/form.js | 4 +- .../CommunityMember/CommunityMember.js | 2 +- .../ContactsDetails/ContactsDetails.js | 2 +- .../ContactsDetails/form/form.js | 4 +- .../EmpRepair/EmpRepair.js | 2 +- .../EmpRepair/form/form.js | 4 +- .../EpidemicSituation/EpidemicSituation.js | 2 +- .../EpidemicSituationCopy.js | 2 +- .../PersonnelManagement/Schedule/Schedule.js | 2 +- .../PersonnelManagement/Schedule/form/form.js | 4 +- .../www/pages/timeTable/form/form.js | 2 +- .../Modules/StuInfoFreshApi.cs | 38 +++++++++++++------ .../XmlConfig/system.config | 2 +- .../StuInfoFresh/StuInfoFreshEntity.cs | 10 +++++ 49 files changed, 111 insertions(+), 81 deletions(-) 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 1a239a386..bbf9d244a 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,15 +1,15 @@ -//var config = { -// webapi: 'http://localhost:8088/', -// web: "http://localhost:8087/"//web地址，用于配置logo -//}; +var config = { + webapi: 'http://localhost:8088/', + web: "http://localhost:8087/"//web地址，用于配置logo +}; //var config = { // webapi: 'http://112.230.201.53:31173/', // web:"http://112.230.201.53/:8081/"//web地址，用于配置logo //}; -var config = { - webapi: 'http://localhost:31173/', - web: "http://localhost:20472/"//web地址，用于配置logo -}; +//var config = { +// webapi: 'http://localhost:31173/', +// web: "http://localhost:20472/"//web地址，用于配置logo +//}; //var config = { 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 ed7745c7a..33135cc3e 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 @@ -201,7 +201,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; 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 141881ceb..96450d451 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 @@ -72,7 +72,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js index f50896295..6da95c78a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js @@ -82,7 +82,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js index 8bc05ce6a..6b961ec40 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js @@ -105,7 +105,7 @@ // learun.layer.loading(false); // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); //}, //rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js index 18dcbabf4..13282bcf5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js @@ -32,7 +32,7 @@ learun.nav.closeCurrent(); } } - }, 'learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js index d1b7d55ef..4da5906b4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js index c5d3628b3..b30f9b801 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js index 4e8fefc85..137248fb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js @@ -98,7 +98,7 @@ learun.layer.loading(false); }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js index e394a5023..5793bd32a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js @@ -103,7 +103,7 @@ learun.layer.loading(false); }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js index 47bbb9013..bbd47de06 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js index 19f83ade4..2b3d16f63 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js @@ -102,7 +102,7 @@ learun.layer.loading(false); }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js index 959acbe22..a482e9091 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js @@ -70,7 +70,7 @@ // } // }); // } - // }, 'Learun敏捷框架提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); // } // } // ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js index 12600ec62..42e701536 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js @@ -130,7 +130,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js index 0e67cde60..f15f05707 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js index 90430a045..8251d5739 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js @@ -85,7 +85,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], 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 cf8bcb276..a4de19d43 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 @@ -126,7 +126,7 @@ // learun.layer.loading(false); // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); //}, //rowBtns: ['删除'] // 列表行左滑按钮 }; 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 33418a949..c3bb87180 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 @@ -37,7 +37,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -69,7 +69,7 @@ // } // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); // } // } // ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html index 0411479a6..e84887552 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html @@ -40,6 +40,10 @@ 班级 +
+ 默认教室 + +
班主任编号 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js index c4f160fa9..6b2941a7e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js @@ -97,7 +97,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js index 406eaa7d3..7d1f51924 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js index e83a92f8e..e0b7e9362 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js @@ -124,7 +124,7 @@ learun.layer.loading(false); }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js index ef840c958..640d5ff90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js index 91c25b906..27b3cb734 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js @@ -118,7 +118,7 @@ learun.layer.loading(false); }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js index 26c07eb55..e79e4a50f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun敏捷框架提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], 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 6b52f0ad0..69ae0b102 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 @@ -167,7 +167,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, //rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js index 6e85361fc..deca14bea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ // } // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); // } //} ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js index a2332a14d..6877efcfe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js @@ -94,7 +94,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js index 11a505948..4dea69815 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js @@ -113,7 +113,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js index 7b36829ee..7a055801e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js index 9589ccf2b..7e09b2b2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js @@ -100,7 +100,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js index 52a4b4c2f..156c4c914 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js index 3f3863594..352775ba2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js @@ -109,7 +109,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js index b235da4e3..9ae066af6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js index c7a4e21f6..3db47122f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js @@ -99,7 +99,7 @@ // learun.layer.loading(false); // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); //}, btnJoinClick: function (item, $item, $page) {// 左滑按钮点击事件 learun.layer.confirm('确定要申请加入该社团吗？', function (_index) { @@ -112,7 +112,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, //rowBtns: ['删除'] // 列表行左滑按钮 rowBtns: ['申请加入'] // 列表行左滑按钮 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js index 9580f3e3f..29107c4eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js index 4e0bd1bb7..379737943 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js @@ -105,7 +105,7 @@ // learun.layer.loading(false); // }); // } - // }, 'Learun智慧校园提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); //}, //rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js index 631031605..40aa385bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js @@ -119,7 +119,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js index cc4eb9e4e..a8e2c165a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js @@ -39,7 +39,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -71,7 +71,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js index 21402073f..f916387ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js @@ -102,7 +102,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js index 30baeba77..f4383d197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js index e2f6a4f7d..c0c48c724 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js @@ -141,7 +141,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; 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 f631dcd30..0b8e53ed1 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 @@ -155,7 +155,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js index 703df31b3..5fd07821e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js @@ -105,7 +105,7 @@ learun.layer.loading(false); }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }, rowBtns: ['删除'] // 列表行左滑按钮 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js index 4a523eac6..e2750f6c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js @@ -38,7 +38,7 @@ learun.nav.closeCurrent(); } } - }, 'learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); }); // 编辑 $header.find('.lr-form-header-edit').on('tap', function () { @@ -70,7 +70,7 @@ } }); } - }, 'Learun智慧校园提示', ['取消', '确定']); + }, '智慧校园提示', ['取消', '确定']); } } ], 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 d364dc515..f25753c3b 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 @@ -71,7 +71,7 @@ // } // }); // } - // }, 'Learun敏捷框架提示', ['取消', '确定']); + // }, '智慧校园提示', ['取消', '确定']); // } // } // ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs index 86189fbab..6b1d55c5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -37,6 +37,7 @@ namespace Learun.Application.WebApi.Modules private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); private AccommodationIBLL accdormitoryIBLL = new AccommodationBLL(); private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL(); + private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL(); /// /// 获取个人信息 @@ -60,19 +61,34 @@ namespace Learun.Application.WebApi.Modules if (classInfoEntity != null) { StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName; - StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo; - StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo; - var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo); - if (empInfoEntity != null) + if (classInfoEntity.ClassTutorNo != null) { - StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName; - StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile; + StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo; + var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo); + if (empInfoEntity != null) + { + StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName; + StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile; + } } - var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo); - if (empInfoEntity2 != null) + if (classInfoEntity.ClassDiredctorNo != null) { - StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName; - StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile; + StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo; + var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassDiredctorNo); + if (empInfoEntity2 != null) + { + StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName; + StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile; + } + } + if (classInfoEntity.SerialNum != null) + { + StuInfoFreshEntity.DefaultClassRoomNo = classInfoEntity.SerialNum; + var classroomEntity = classroomInfoIBLL.GetClassroomInfoEntityByNo(classInfoEntity.SerialNum); + if (classroomEntity != null) + { + StuInfoFreshEntity.DefaultClassRoomName = classroomEntity.ClassroomName; + } } } @@ -142,7 +158,7 @@ namespace Learun.Application.WebApi.Modules return Success(result); } - + /// /// 保存完善个人信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 96db78846..c5d6754f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -97,7 +97,7 @@ - + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index 0721aae25..48515af83 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -663,6 +663,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public string ClassDiredctorMobile { get; set; } /// + /// 默认教室 + /// + [NotMapped] + public string DefaultClassRoomNo { get; set; } + /// + /// 默认教室 + /// + [NotMapped] + public string DefaultClassRoomName { get; set; } + /// /// 是否完善信息 /// [NotMapped]