diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
index 11d6ed1ed..683169c48 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
@@ -1189,21 +1189,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
BoyNum = data.Count(y => y.GenderNo == "1"),
GirlNum = data.Count(y => y.GenderNo == "0"),
};
- var zhounei = data.Where(a => a.ProvinceNo.Contains("5121"));
+ var zhounei = data.Where(a => a.ProvinceNo.Contains("42"));
var item1 = new
{
- ProvinceNo = "州内",
+ ProvinceNo = "省内",
TotalNum = zhounei.Count(),
RegisterNum = zhounei.Count(y => y.RegisterStatus == "1"),
BoyNum = zhounei.Count(y => y.GenderNo == "1"),
GirlNum = zhounei.Count(y => y.GenderNo == "0"),
};
- var zhouwai = data.Where(a => !a.ProvinceNo.Contains("5121"));
+ var zhouwai = data.Where(a => !a.ProvinceNo.Contains("42"));
var item2 = new
{
- ProvinceNo = "州外",
+ ProvinceNo = "省外",
TotalNum = zhouwai.Count(),
RegisterNum = zhouwai.Count(y => y.RegisterStatus == "1"),
BoyNum = zhouwai.Count(y => y.GenderNo == "1"),
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationBed.js
index 6f333504a..241cd3095 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationBed.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationBed.js
@@ -207,7 +207,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'MajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
index fbcdcae12..8243de54f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js
index 24ae0d2c6..ed956c748 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js
@@ -181,7 +181,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
index 74fbe8dd9..73af8e294 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
@@ -77,7 +77,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
index 729f8ccc6..f8d4e1712 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
@@ -301,7 +301,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
index 1e652cb84..8dad6003f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
@@ -290,7 +290,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js
index 76c446b7b..ebe29e4de 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js
@@ -141,7 +141,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'MajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index e3b4cdecc..976426a9a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
@@ -345,7 +345,7 @@ var bootstrap = function ($, learun) {
// });
// }
//},
- //{ label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ //{ label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
//{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
//{
// label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
index f6869e93d..a1015a047 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
@@ -228,7 +228,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsArea.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsArea.js
index 8fa598b52..7c0c245b4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsArea.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsArea.js
@@ -43,13 +43,13 @@ var bootstrap = function ($, learun) {
if (value == "总计") {
callback("总计");
}
- if (value == "州内") {
- callback("州内");
+ if (value == "省内") {
+ callback("省内");
}
- if (value == "州外") {
- callback("州外");
+ if (value == "省外") {
+ callback("省外");
}
- if (value != "州内" && value != "州外" && value != "总计") {
+ if (value != "省内" && value != "省外" && value != "总计") {
learun.clientdata.getAsync('custmerData',
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
index 2df2a428a..53e428eb2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
@@ -227,7 +227,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
{
label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",