diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index ee33a818c..c8f6ed840 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -19,13 +19,13 @@
-
班级
-
-
-
年级
+
+
班级
+
+
姓名
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index e9422510d..c5fa514c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -41,7 +41,7 @@ var bootstrap = function ($, learun) { param: { strWhere: "1=1 AND CheckMark=1" }, select: function (item) { var Grades = $("#Grade").lrselectGet(); - if (Grades) { + if (Grades != null && Grades != "" && Grades != "undefined") { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, @@ -78,12 +78,14 @@ var bootstrap = function ($, learun) { text: "text", select: function (item) { var MajorNos = $("#MajorNo").lrselectGet(); - if (MajorNos) { + if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" } + param: { + strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } }); } else { $('#ClassNo').lrselectRefresh({ @@ -97,7 +99,9 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + param: { + strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } }); } else { $('#ClassNo').lrselectRefresh({ @@ -106,7 +110,8 @@ var bootstrap = function ($, learun) { param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } - } + } + } }); $('#ClassNo').lrselect({ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue index bdeb390ce..2dd1df797 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue @@ -111,7 +111,7 @@ export default { // } // }) - uni.chooseImage({ + uni.chooseFile({ count: Number(this.number), sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], 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 600ac69e3..f3f6ba6fe 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,9 +21,9 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - // "http://cyzjzx.gnway.cc:30626/"//测试地址 + "http://cyzjzx.gnway.cc:30626/"//测试地址 // "http://cyzjzx.gnway.cc:29615/"//正式地址 - "http://192.168.10.58:8012/" + // "http://192.168.10.31:8088/" ], "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址 //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址