Переглянути джерело

【修改】开关显示控制:增加链接地址的配置;

master
dyy 3 роки тому
джерело
коміт
b879a75bbc
13 змінених файлів з 47 додано та 31 видалено
  1. +11
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Form.cshtml
  2. +3
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js
  3. +7
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml
  5. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive.cshtml
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour.cshtml
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne.cshtml
  8. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSeven.cshtml
  9. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix.cshtml
  10. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree.cshtml
  11. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo.cshtml
  12. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchEntity.cs
  13. +5
    -8
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs

+ 11
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Form.cshtml Переглянути файл

@@ -3,9 +3,17 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="TeachSwitch" >
<div class="lr-form-item-title">功能开启</div>
<div id="status"></div>
<div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
<div class="lr-form-item-title">开关名称<font face="宋体">*</font></div>
<input id="type" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
<div class="lr-form-item-title">功能开启<font face="宋体">*</font></div>
<div id="status" isvalid="yes" checkexpession="NotNull" ></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
<div class="lr-form-item-title">链接地址<font face="宋体">*</font></div>
<input id="url" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachSwitch/Form.js")

+ 3
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js Переглянути файл

@@ -80,6 +80,8 @@ var bootstrap = function ($, learun) {
return '网上办事大厅开关';
} else if (val == 'wxloginforpc') {
return '微信快捷登录PC端';
} else {
return val;
}

}
@@ -96,6 +98,7 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "链接地址", name: "url", width: 200, align: "left" },
],
mainId: 'ID',
isPage: true


+ 7
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs Переглянути файл

@@ -221,11 +221,14 @@ namespace Learun.Application.Web.Controllers

var result = teachSwitchIBLL.FindFirst("js");
ViewBag.TeachSwitch = result;
var result2 = teachSwitchIBLL.FindFirst("fx");
ViewBag.FeiXinSwitch = result2;
//飞信下载
var result2 = teachSwitchIBLL.GetFirst("fx");
ViewBag.FeiXinSwitch = result2.status == "1" ? true : false;
ViewBag.FeiXinUrl = result2.url;
//网上办事大厅
var result3 = teachSwitchIBLL.FindFirst("ssosystem");
ViewBag.SSOSystemSwitch = result3;
var result3 = teachSwitchIBLL.GetFirst("ssosystem");
ViewBag.SSOSystemSwitch = result3.status == "1" ? true : false;
ViewBag.SSOSystemUrl = result3.url;
//微信快捷登录
var result4 = teachSwitchIBLL.FindFirst("wxloginforpc");
ViewBag.WeixinLoginSwitch = result4;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml Переглянути файл

@@ -67,13 +67,13 @@
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeiXinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
}
<img src="~/Content/images/logins/login2.png" />
<!--登录框 正常登录-->


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive.cshtml Переглянути файл

@@ -21,13 +21,13 @@
<div class="loginCon">
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeixinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
}
@if (ViewBag.WeixinLoginSwitch)
{


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour.cshtml Переглянути файл

@@ -74,11 +74,11 @@
<div style="text-align: right">
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeixinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne.cshtml Переглянути файл

@@ -21,13 +21,13 @@
<div class="loginBox commonClear">
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeixinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
}
<div class="loginL">
<div class="loginLimg">


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSeven.cshtml Переглянути файл

@@ -61,11 +61,11 @@
<!-- <input type="button" class="btn btn-white btn-outline btn-lg btn-rounded progress-login" value="教师注册" style="cursor:pointer"> -->
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index"><span class="bbh_bs">网上办大事大厅</span></a>
<a href="@ViewBag.SSOSystemUrl"><span class="bbh_bs">网上办大事大厅</span></a>
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe"><span class="bbh_bs bbh_sdow"><img src="~/Content/images/Login/login8-5.png" />飞星下载</span></a>
<a href="@ViewBag.FeixinUrl"><span class="bbh_bs bbh_sdow"><img src="~/Content/images/Login/login8-5.png" />飞星下载</span></a>
}
</div>
<div class="bbh">


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix.cshtml Переглянути файл

@@ -71,11 +71,11 @@
}
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index"><img src="~/Content/images/Login/login8-4.png" alt="" /><span class="bbh_span2">网上办事大厅</span></a>
<a href="@ViewBag.SSOSystemUrl"><img src="~/Content/images/Login/login8-4.png" alt="" /><span class="bbh_span2">网上办事大厅</span></a>
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe"><img src="~/Content/images/Login/login8-5.png" alt="" /><span class="bbh_span2">飞星下载</span></a>
<a href="@ViewBag.FeixinUrl"><img src="~/Content/images/Login/login8-5.png" alt="" /><span class="bbh_span2">飞星下载</span></a>
}
</div>
</div>


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree.cshtml Переглянути файл

@@ -79,11 +79,11 @@
<div style="text-align: right;margin-top: 10px;">
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down">网上办事大厅</a>
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeixinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo.cshtml Переглянути файл

@@ -73,11 +73,11 @@
<div style="text-align: right">
@if (ViewBag.SSOSystemSwitch)
{
<a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
<a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
}
@if (ViewBag.FeixinSwitch)
{
<a href="/feixin.exe" class="down">
<a href="@ViewBag.FeixinUrl" class="down">
<img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
</a>
}


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchEntity.cs Переглянути файл

@@ -29,6 +29,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("TYPE")]
public string type { get; set; }
/// <summary>
/// 链接地址
/// </summary>
[Column("URL")]
public string url { get; set; }

#endregion



+ 5
- 8
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs Переглянути файл

@@ -45,7 +45,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var fxEntity = new TeachSwitchEntity()
{
status = "0",
type = "fx"
type = "fx",
url= "/feixin.exe"
};
fxEntity.Create();
this.BaseRepository().Insert(fxEntity);
@@ -56,7 +57,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var jsEntity = new TeachSwitchEntity()
{
status = "0",
type = "ssosystem"
type = "ssosystem",
url= "/SSOSystem/Index"
};
jsEntity.Create();
this.BaseRepository().Insert(jsEntity);
@@ -73,12 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
this.BaseRepository().Insert(jsEntity);
}
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.ID,
t.status,
t.type
");
strSql.Append("SELECT t.* ");
strSql.Append(" FROM TeachSwitch t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();


Завантаження…
Відмінити
Зберегти