增加定位打卡字段

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml

@@ -30,7 +30,7 @@
         <img style="height: 40px;" width="95%" src="~/LR_SystemModule/LogoImg/GetImg?code=headbg" alt="经典风格">
     </div>
     <div>
-        <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&py=akesu&a=getcode&id=34&h=25&w=280"></iframe>
+        <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&py=haerbin&a=getcode&id=34&h=25&w=280"></iframe>
     </div>
 </div>
 <div class="lr-lg-setting" id="lr_lg_setting">

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; }
+        }
+
         /// <summary>
         /// 打卡
         /// </summary>
@@ -49,6 +60,8 @@ namespace Learun.Application.WebApi.Modules
         /// <returns></returns>
         public Response ClockIn(dynamic _)
         {
+            Attendance parameter = this.GetReqData<Attendance>();
+
             adr_RestrictionBLL.ClockIn();
 
             return Success("打卡成功");

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -25,7 +25,7 @@
 	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
 
   <!--西昌-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 </connectionStrings>

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
         /// </summary>
         [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 扩展操作

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" }