From 108892fb4df8b8cd5e807a8553bf950f335b9c77 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 1 Aug 2023 18:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E4=BD=8D=E6=89=93?= =?UTF-8?q?=E5=8D=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/AdminDefault.cshtml | 2 +- .../Modules/AttendanceApi.cs | 13 +++++++++++++ .../XmlConfig/database.config | 4 ++-- .../ADR_Record/ADR_RecordEntity.cs | 12 ++++++++++++ .../LearunApp-2.2.0/config.js | 18 +++++++++--------- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml index 1a6a90dfb..07a300462 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml @@ -30,7 +30,7 @@ 经典风格
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs index 5fb68930c..8bef8976c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs @@ -42,6 +42,17 @@ namespace Learun.Application.WebApi.Modules }; return Success(jsondata); } + + public class Attendance + { + public decimal ALon { get; set; } + public decimal ALat { get; set; } + public bool AIsOut { get; set; } + public string ARemark { get; set; } + public string ADPhoto { get; set; } + public string ClockPlace { get; set; } + } + /// /// 打卡 /// @@ -49,6 +60,8 @@ namespace Learun.Application.WebApi.Modules /// public Response ClockIn(dynamic _) { + Attendance parameter = this.GetReqData(); + adr_RestrictionBLL.ClockIn(); return Success("打卡成功"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config index 19868a88a..f069b84be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config @@ -25,7 +25,7 @@ --> - - + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs index 6992f7c6c..1a17778f6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs @@ -79,6 +79,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ADPHOTO")] public string ADPhoto { get; set; } + + [Column("ALON")] + public decimal ALon { get; set; } + + [Column("ALAT")] + public decimal ALat { get; set; } + + [Column("AISOUT")] + public bool AIsOut { get; set; } + + [Column("AREMARK")] + public string ARemark { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 67f8385f9..a27bdc406 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -2,24 +2,24 @@ export default { // 登录页显示的公司名称 "company": "数字化智慧校园", // App 版本号 - "appVersion": "2.0", + "appVersion": "1.0.0", // 是否允许用户注册 "enableSignUp": true, //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 - // "apiHost": [ - // "http://localhost:8088/" - // ], - // "webHost":"http://localhost:8087/", + "apiHost": [ + "http://localhost:31173/" + ], + "webHost":"http://localhost:20472/", //学校测试环境地址： // "apiHost": [ // "http://218.84.232.3:9003/" // ], // "webHost":"http://218.84.232.3:8000/", //学校正式环境地址： - "apiHost": [ - "http://10.30.0.10:9002/" - ], - "webHost":"http://10.30.0.10:8000/", + // "apiHost": [ + // "http://10.30.0.10:9002/" + // ], + // "webHost":"http://10.30.0.10:8000/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ { username: "system", password: "www.qj.com" }