Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using Learun.Application.Organization;
+using System.IO;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -97,6 +98,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             return Success(jsonData);
         }
+        /// <summary>
+        /// 下载入学须知
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult FileDownLoad()
+        {
+            FileStreamResult result = null;
+            try
+            {
+                var path = Server.MapPath("~/Content/otherFile/");
+                var pathoffull = path + "入学须知.pdf";
+                FileStream fsread = fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                result = File(fsread, "application/pdf", "入学须知.pdf");
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
 
         protected virtual ActionResult Success(string info)
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml

@@ -14,7 +14,7 @@
 <div class="lr-form-wrap" id="form1">
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
-        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
@@ -40,6 +40,7 @@
         <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div>
         <input id="MidTermExam" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div id="scoreDiv"></div>
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">毕业学校<font face="宋体">*</font></div>
         <input id="FromSchool" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoBit',
             });
-            $('#IdCardPto1').lrUploader({ isUpload:false});
+            $('#IdCardPto1').lrUploader({ isUpload: false });
             $('#IdCardPto2').lrUploader({ isUpload: false });
             $('#MidDiplomaPto').lrUploader({ isUpload: false });
             $('#MidAchievementPto').lrUploader({ isUpload: false });
@@ -98,6 +98,17 @@ var bootstrap = function ($, learun) {
                         }
                     }
                     MajorNo = data.StuEnroll.MajorNo;
+                    var str = '';
+                    if (data.StuEnrollMidExamScore) {
+                        $.each(data.StuEnrollMidExamScore,
+                            function (i, item) {
+                                str += '<div class="col-xs-6 lr-form-item" data-table="StuEnrollMidExamScore">';
+                                str += '<div class="lr-form-item-title">' + item.subjectName + '</div>';
+                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + item.score + '" />';
+                                str += '</div>';
+                            });
+                        $('#scoreDiv').html(str);
+                    }
                 });
             }
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml

@@ -101,13 +101,6 @@
     </style>
 </head>
 <body>
-
-    @*<div class="header">
-            <div class="fromSec">
-
-                <a href="#">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
-        </div>
-        </div>*@
     <div class="warpper" id="app">
         <!--  / index_sec5  -->
 
@@ -512,17 +505,20 @@
                 },
             });
 
+            //当前时间
+            var myDate = new Date();
+            var tYear = myDate.getFullYear();
             //专业
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + '&where=' + "Year='" + tYear + "'",
                 async: false,
                 success: function (msg) {
                     var companys = $.parseJSON(msg).data.data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys,
-                        function (i, item) {
-                            str += '<option value="' + item.id + '">' + item.majorname + '</option>'
-                        })
+                        function(i, item) {
+                            str += '<option value="' + item.id + '">' + item.majorname + '</option>';
+                        });
                     $("#MajorNo").html(str);
                 },
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml

@@ -51,12 +51,11 @@
                             <input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
                         </div>
                         <div id="admmsg">
-                            <div id="fileDownLoad"></div>
                             <span style="font-size: 12px; color: red;" id="msg">录取成功，请手机截屏，保存结果图片，报名时出示此图片！</span>
+                            <div id="fileDownLoad"><a alt="点击下载">入学须知</a></div>
                         </div>
                     </div>
-                    <!--  / chickForm_sec1  -->
-                    @*<div class="chickBtn" lay-submit lay-filter="*">提交</div>*@
+                    
                 </form>
             </div>
         </div>
@@ -155,8 +154,42 @@
                 }
             });
 
-            renderForm()
+            $('#fileDownLoad').find('a').on('click',
+                function() {
+                    //下载入学须知
+                    //var url = "";
+                    //var a = document.createElement('a');
+                    //a.download = 'text.zip';
+                    //a.href = url;
+                    //a.target = '_bank';
+                    //document.appendChild(a);
+                    //a.click();
+                    //document.removeChild();
+                    $.ajax({
+                        url: '/EducationalAdministration/StuEnrollPhone/FileDownLoad',
+                        type: "Post",
+                        dataType: "json",
+                        async: true,
+                        cache: false,
+                        success: function (data) {
+                            if (data.code == 200) {
+
+
+                            } else {
+                                alert(data.info);
+                            }
+                        },
+                        error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        },
+                        beforeSend: function () {
+                        },
+                        complete: function () {
+                        }
+                    });
+                });
 
+            renderForm();
+            
         })
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf

@@ -0,0 +1,55 @@
+    数字化智慧校园
+统一身份认证补充接口
+
+            V1.0
+概述
+
+      根据特定需求开发补充接口
+
+登录接口
+
+      采用标准 Http GET 请求发送用户名、密码到认证接口，接口实现用户名密码判定后返
+回标准 json；
+
+请求地址：http://10.30.0.10:8000/Login/CheckLoginForSSOBC
+请求方式：发送标准 Http GET 请求到认证地址
+
+接口请求参数                         说明
+       参数
+           用户名
+u          密码
+p
+
+认证接口返回参数
+
+      参数                       说明
+
+code       状态码 返回 200 成功、其他失败
+
+info       状态消息 返回 login success 表示登录成功、其他失败
+
+data       保留 暂时无用
+
+登录成功后，认证服务器将在用户浏览器 cookies 中写入数字化智慧校园系统数据，第三方
+系统可直接跳转到 http://10.30.0.10:8000/Home/Index 进入数字化智慧校园系统。
+
+退出登录接口
+
+      第三方系统退出时，需要主动调用退出登录接口以同步数字化智慧校园系统退出状态。
+      采用标准 Http POST 请求，返回标准 json；
+
+请求地址：http://10.30.0.10:8000/Login/OutLoginForSSOBC
+请求方式：发送标准 Http POST 请求到认证地址
+
+接口请求参数：无
+
+认证接口返回参数
+
+      参数                       说明
+
+code       状态码 返回 200 成功、其他失败
+
+info       状态消息 返回 logout success 表示退出成功、其他失败
+
+data       保留 暂时无用
+