From f394a21970e4ed97588c99cc3a08d693dad4e9cf Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 13 May 2022 16:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E4=B8=9A=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E8=AF=BE=E7=A8=8B=E7=BB=91=E5=AE=9A=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=BD=95=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=AF=BE=E5=88=99=E4=B8=93=E4=B8=9A=E9=9D=9E=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/ClassPlan/Index.js                   | 18 ++++++++++--------
 .../Views/LessonInfo/Form.js                   |  2 +-
 .../XmlConfig/database.config                  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js
index c22726aea..302b579fe 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js	
@@ -36,14 +36,16 @@ var bootstrap = function ($, learun) {
             });
             $('#Semester').lrDataItemSelect({ code: 'Semester' });
             $("#MajorNo").lrselect();
-            $('#LessonNo').lrselect({
-                placeholder: "请选择课程",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
-                value: 'value',
-                text: 'text',
-                maxHeight: 200
-            });
+
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            //$('#LessonNo').lrselect({
+            //    placeholder: "请选择课程",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+            //    value: 'value',
+            //    text: 'text',
+            //    maxHeight: 200
+            //});
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js
index 80607a514..169d4781a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js	
@@ -40,7 +40,7 @@ var bootstrap = function ($, learun) {
             $('#LessonTypeId').lrDataSourceSelect({
                 code: 'CdLessonType', value: 'ltid', text: 'lessontypename', select: function (item) {
                     if (item != null && item != undefined) {
-                        if (item.lessontypename === "公开课") {
+                        if (item.lessontypename.indexOf('公共') != -1) {
                             $("#TeachMajorNo").removeAttr("isvalid");
                             $("#TeachMajorNo").removeAttr("NotNull");
                         } else {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 3ae2b5461..3321e5b2a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -38,5 +38,5 @@
 	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=cspaikenew;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
 </connectionStrings>
\ No newline at end of file