From 371c55ea0d03cf1d0722720626c378e4a7dba8ae Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 18 Nov 2022 15:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=99?=
=?UTF-8?q?=E5=8A=A1-=E4=B8=93=E4=B8=9A=E5=8F=91=E5=B1=95=EF=BC=9A?=
=?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=81=E4=B9=A6=E3=80=81=E8=8D=A3=E8=AA=89?=
=?UTF-8?q?=E3=80=81=E8=B5=9B=E4=BA=8B=E3=80=81=E6=96=87=E7=AB=A0=EF=BC=8C?=
=?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E5=8F=91?=
=?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=EF=BC=9B=E6=96=87=E7=AB=A0=E5=AE=9E?=
=?UTF-8?q?=E4=BD=93=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/StudentArticlePublic/Index.js | 5 ++--
.../Views/StudentCertificate/Index.js | 5 ++--
.../Views/StudentCompetition/Index.js | 5 ++--
.../Views/StudentHonor/Index.js | 5 ++--
.../StudentArticlePublicEntity.cs | 26 +++++++++----------
.../LearunApp-2.2.0/config.js | 4 +--
6 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentArticlePublic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentArticlePublic/Index.js
index 03538e80a..c81495dd3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentArticlePublic/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentArticlePublic/Index.js
@@ -55,8 +55,9 @@ var bootstrap = function ($, learun) {
res = top[id].validForm();
// 保存数据
if (res) {
- processId = learun.newGuid();
- res = top[id].save(processId, refreshGirdData);
+ res = top[id].save('', function () {
+ page.search();
+ });
}
return res;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js
index 280c34adf..8c0820017 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js
@@ -54,8 +54,9 @@ var bootstrap = function ($, learun) {
res = top[id].validForm();
// 保存数据
if (res) {
- processId = learun.newGuid();
- res = top[id].save(processId, refreshGirdData);
+ res = top[id].save('', function () {
+ page.search();
+ });
}
return res;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js
index 8cea599a7..5efa79d4d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js
@@ -55,8 +55,9 @@ var bootstrap = function ($, learun) {
res = top[id].validForm();
// 保存数据
if (res) {
- processId = learun.newGuid();
- res = top[id].save(processId, refreshGirdData);
+ res = top[id].save('', function () {
+ page.search();
+ });
}
return res;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentHonor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentHonor/Index.js
index dda8b2d43..82a09d015 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentHonor/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentHonor/Index.js
@@ -54,8 +54,9 @@ var bootstrap = function ($, learun) {
res = top[id].validForm();
// 保存数据
if (res) {
- processId = learun.newGuid();
- res = top[id].save(processId, refreshGirdData);
+ res = top[id].save('', function () {
+ page.search();
+ });
}
return res;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentArticlePublic/StudentArticlePublicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentArticlePublic/StudentArticlePublicEntity.cs
index 616812359..97c90a9a2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentArticlePublic/StudentArticlePublicEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentArticlePublic/StudentArticlePublicEntity.cs
@@ -45,25 +45,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("CLASSNO")]
public string ClassNo { get; set; }
///
- /// 赛事名称
+ /// 刊登期刊名称
///
- [Column("SCNAME")]
- public string SCName { get; set; }
+ [Column("APNAME")]
+ public string APName { get; set; }
///
- /// 赛事级别
+ /// 刊登期刊级别
///
- [Column("SCLEVEL")]
- public string SCLevel { get; set; }
+ [Column("APLEVEL")]
+ public string APLevel { get; set; }
///
- /// 赛事获取时间
+ /// 刊登期刊时间
///
- [Column("SCTIME")]
- public DateTime? SCTime { get; set; }
+ [Column("APTIME")]
+ public DateTime? APTime { get; set; }
///
- /// 赛事种类
+ /// 指导老师
///
- [Column("SCTYPE")]
- public string SCType { get; set; }
+ [Column("INSTRUCTOR")]
+ public string Instructor { get; set; }
///
/// 分值
///
@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("URL")]
public string Url { get; set; }
///
- /// 颁发单位
+ /// 出版单位
///
[Column("UNIT")]
public string Unit { get; set; }
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 175f4aba8..849f91f4a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
@@ -23,11 +23,11 @@ export default {
"apiHost": [
// "http://cyzjzx.gnway.cc:31218/"//测试地址接口
// "http://cyzjzx.gnway.cc:29904/"//正式地址接口
- "http://192.168.10.58:8012/"
+ "http://192.168.10.175:8088/"
],
// "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
// "webHost":"http://wxd3f.cyzjzx.com/",//正式地址
- "webHost":"http://192.168.10.31:8087/",
+ "webHost":"http://192.168.10.175:8087/",
// 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
"devAccount": [
// 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428