From bf688e9ef23302c7544f177167cd0af18fc96e2e Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 18 Jul 2022 18:15:31 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E7=94=9F?=
=?UTF-8?q?=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/StuEnrollPhoneController.cs | 30 ++++++--
.../Views/StuEnrollPhone/Link.cshtml | 11 ++-
.../Views/StuEnrollPhone/Search.cshtml | 35 +--------
.../Views/StuEnrollPhone/SearchResult.cshtml | 64 +++++------------
.../StuRecruitmentBrochure.cshtml | 67 ++++++++++++++++++
.../Content/images/StuRecruitmentBrochure.jpg | Bin 0 -> 2345030 bytes
.../Content/otherFile/入学须知.pdf | Bin 152472 -> 0 bytes
.../Content/otherFile/各专业介绍.pdf | Bin 0 -> 3647579 bytes
.../Content/otherFile/新生入学须知.pdf | Bin 0 -> 94790 bytes
.../Learun.Application.Web.csproj | 2 +
10 files changed, 122 insertions(+), 87 deletions(-)
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuRecruitmentBrochure.jpg
delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/各专业介绍.pdf
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/新生入学须知.pdf
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs
index fe1805a70..f5a00aa06 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs
@@ -15,14 +15,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
private StuEnrollIBLL stuEnrollIBLL = new StuEnrollBLL();
+ #region 视图
public ActionResult Link()
{
return View();
}
+
public ActionResult Form()
{
return View();
}
+
public ActionResult Search(int type)
{
if (type == 1)
@@ -37,11 +40,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
}
return View();
}
+
public ActionResult SearchResult()
{
return View();
}
+ ///
+ /// 招生简章
+ ///
+ ///
+ public ActionResult StuRecruitmentBrochure()
+ {
+ return View();
+ }
+
+ #endregion
+
+
///
/// 报名
///
@@ -99,20 +115,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return Success(jsonData);
}
///
- /// 下载入学须知
+ /// 下载
///
+ /// 文件名称
+ /// 原文件名称
///
- [HttpPost]
- [AjaxOnly]
- public ActionResult FileDownLoad()
+ public ActionResult FileDownLoad(string name, string pathName)
{
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");
+ var pathoffull = path + pathName;
+ FileStream fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+ result = File(fsread, "application/pdf", name + ".pdf");
return result;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml
index fdbdd8740..1a412c3f3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml
@@ -32,6 +32,8 @@
+
+
@@ -45,7 +47,14 @@
$('#loc').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=1');
//查询录取结果
$('#res').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=2');
- })
+ //招生简章
+ $('#stuRecruitmentBrochure').attr('href', '/EducationalAdministration/StuEnrollPhone/StuRecruitmentBrochure');
+
+ $('.major').find('a').on('click',
+ function () {
+ location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年各专业介绍'+'&pathName='+'各专业介绍.pdf';
+ });
+ });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml
index 68a3ad432..7ea8a53f9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml
@@ -61,42 +61,9 @@
var form = layui.form;
//按钮点击
form.on('submit(*)', function (data) {
- //var strEntity = JSON.stringify(data.field);
-
location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val();
- //$.ajax({
- // url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
- // data: { strEntity: strEntity },
- // type: "GET",
- // dataType: "json",
- // async: true,
- // cache: false,
- // success: function (data) {
- // if (data.code == 200) {
- // alert("报名成功，请等待考试通知！");
- // } else {
- // alert(data.info);
- // }
- // },
- // error: function (XMLHttpRequest, textStatus, errorThrown) {
- // },
- // beforeSend: function () {
- // },
- // complete: function () {
- // }
- //});
- //return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
-
+
});
-
- //var laydate = layui.laydate;
-
- //时间选择
- //laydate.render({
- // elem: '#Birthday',
- // min: today.y + '-' + today.m + '-' + today.d
- //});
-
});
$(window).load(function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
index 5283b9fe5..85a2bc5a5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
@@ -37,9 +37,9 @@
@*
- * 手机号
-
-
*@
+ * 手机号
+
+ *@
-
+
@@ -76,8 +77,6 @@
//var StuMobile = request('StuMobile');
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
-
-
});
$(window).load(function () {
$('#admmsg').hide();
@@ -103,7 +102,7 @@
if (data.StuEnroll) {
$('#StuName').val(decodeURI(StuName));
$('#IDCard').val(IDCard);
- // $('#StuMobile').val(StuMobile);
+ // $('#StuMobile').val(StuMobile);
//$('#ExamLocation').val(data.StuEnroll.ExamLocation);
//if (data.StuEnroll.ExamStartTime) {
// $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime);
@@ -119,7 +118,8 @@
}
} else {
- $('#app').html('
');
+ $('#app').html(
+ '');
}
if (data.examData) {
var examData = data.examData;
@@ -129,11 +129,15 @@
var etime = examData[i].BeginTime + '~' + examData[i].EndTime;
html += '';
html += ' 科目';
- html += '';
+ html += '';
html += '
';
html += '';
html += ' 时间';
- html += '';
+ html += '';
html += '
';
html += '
';
@@ -155,42 +159,12 @@
});
$('#fileDownLoad').find('a').on('click',
- function() {
+ 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 () {
- }
- });
+ location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年新生入学须知' + '&pathName=' + '新生入学须知.pdf';;
});
-
renderForm();
-
- })
+ });
//重新渲染表单
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml
new file mode 100644
index 000000000..d4f548940
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml
@@ -0,0 +1,67 @@
+@{
+
+ Layout = null;
+}
+
+
+
+
+
+
+
+
+
+ 招生简章
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+