(strSql.ToString());
}
catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js
index e1a4ab860..1f38f96e0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js
@@ -96,7 +96,11 @@ var bootstrap = function ($, learun) {
headData: [
{ label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
{ label: '学期', name: 'Semester', width: 60, align: "left" },
- { label: '考试日期', name: 'ExamDate', width: 120, align: "left" },
+ {
+ label: '考试日期', name: 'ExamDate', width: 100, align: "left", formatter: function (v) {
+ return learun.formatDate(v, "yyyy-MM-dd");
+ }
+ },
{ label: '考试时间', name: 'ExamTime', width: 120, align: "left" },
{ label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
{ label: '课程名称', name: 'LessonName', width: 200, align: "left" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml
index 7b7a69828..d67de2992 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml
@@ -15,5 +15,9 @@
学期*
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js
index 68e543073..0986a9145 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js
@@ -30,6 +30,12 @@ var bootstrap = function ($, learun) {
value: 'value',
text: 'text'
});
+ $('#SyncType').lrselect({
+ placeholder: "请选择同步内容",
+ data: [{ text: "课表", value: "1" }, { text: "开课计划", value: "2" }],
+ value: 'value',
+ text: 'text'
+ });
},
initData: function () {
//if (!!selectedRow) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
index e7f808ccc..7643558b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
@@ -157,7 +157,7 @@
系部
*@
- *@
- *@
- *@
- *@
- *@
- *@
最高学位
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 4e18edd7e..ef6d678c7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
@@ -49,11 +49,11 @@ var bootstrap = function ($, learun) {
$("#GraduateSchoolName").parent().hide();
$("#SubjectSpeciesNo").parent().hide();
$("#ForeignLanguageNo").parent().hide();
- $("#EmpSortNo").parent().hide();
+ //$("#EmpSortNo").parent().hide();
$("#EmpFullTimeNo").parent().hide();
//$("#DeptNo").parent().hide();
- $("#TitleOfTechPostNo").parent().hide();
- $("#InSchoolDate").parent().hide();
+ //$("#TitleOfTechPostNo").parent().hide();
+ //$("#InSchoolDate").parent().hide();
$("#resume").parent().hide();
//$("#Photo").parent().hide();
}
@@ -129,24 +129,27 @@ var bootstrap = function ($, learun) {
$('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
$('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
$('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
- $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
+ //$('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
$('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
- $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
+ //$('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
//$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
- $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
+ //$('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
$('#Photo').lrUploader();
- $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
- $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
+ //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+ $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
+
+ //$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
+ $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'HighestEducationAcquisitionMode' });
$('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
$('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
$('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
- $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });
+ //$('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });
$('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' });
$('#WorkLevel').lrDataItemSelect({ code: 'TechnicalLevelOfWorker' });
$('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' });
$('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
$('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
- $('#ProfessionalTitleLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
+ //$('#ProfessionalTitleLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
//内容编辑器
ue = UE.getEditor('editor');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
index 1cbc41857..a233a937a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
//政治面貌
$('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
//最高学历
- $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+ $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
//民族
@@ -464,12 +464,11 @@ var bootstrap = function ($, learun) {
{
label: "最高学历", name: "HighestRecord", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+ learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'culturedegreeno',
+ code: 'HighestEducation',
callback: function (_data) {
- callback(_data['culturedegree']);
+ callback(_data.text);
}
});
}
@@ -615,7 +614,7 @@ var bootstrap = function ($, learun) {
],
mainId: 'EmpId',
- sidx: 'F_Order asc',
+ sidx: 'DeptOrder,F_Order',
isPage: true,
isMultiselect: true
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
index a08299eed..0b992dc31 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
@@ -30,13 +30,13 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
public class NoticeController : MvcControllerBase
{
private NoticeIBLL noticeIBLL = new NoticeBLL();
+ private DataItemIBLL dataItemIbll = new DataItemBLL();
+ private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+ private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
private WeChatConfigIBLL weChatConfigIbll = new WeChatConfigBLL();
private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
private UserIBLL userIbll = new UserBLL();
private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
- private DataItemIBLL dataItemIbll = new DataItemBLL();
- private DepartmentIBLL departmentIbll = new DepartmentBLL();
- private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
private DepartmentReleasePermissionsIBLL departmentReleasePermissionsIbll =
new DepartmentReleasePermissionsBLL();
@@ -317,6 +317,17 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
{
entity.F_NewsContent = WebHelper.HtmlEncode(entity.F_NewsContent);
noticeIBLL.SaveEntity(keyValue, entity);
+
+
+ return Success("保存成功！");
+ }
+
+ [HttpPost, ValidateAntiForgeryToken, AjaxOnly, ValidateInput(false)]
+ public ActionResult SaveFormAndSubmit(string keyValue, NewsEntity entity)
+ {
+ entity.F_NewsContent = WebHelper.HtmlEncode(entity.F_NewsContent);
+ noticeIBLL.SaveFormAndSubmit(keyValue, entity);
+ //推送通知
//读取信息推送管理-通知公告推送（01）的配置
var informationPushEntity = sys_InformationPushIBLL.GetEntityByPushItem("01");
if (informationPushEntity != null && informationPushEntity.Status == true)
@@ -327,19 +338,17 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
if (entity.F_IsSendFX.HasValue && entity.F_IsSendFX == true)
{
Task.Run(async () =>
- {
- using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
- {
- var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
- await hubConnection.Start();
- await hubProxy.Invoke("PushAnnouncement", entity.F_NewsId, entity.F_FullHead, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)).Substring(0, 20), "news", entity.F_SendPostId, entity.F_SendDeptId);
- }
- });
+ {
+ using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
+ {
+ var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
+ await hubConnection.Start();
+ await hubProxy.Invoke("PushAnnouncement", entity.F_NewsId, entity.F_FullHead, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(entity.F_NewsContent)).Substring(0, 20), "news", entity.F_SendPostId, entity.F_SendDeptId);
+ }
+ });
}
-
return Success("保存成功！");
}
-
Task DoWeixinPush(NewsEntity entity)
{
//微信推送
@@ -414,6 +423,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
}
}
PushWeixin(needpostuserlist, entity.F_FullHead);
+
+ //消息提醒表
+ PushMessageRemind(needpostuserlist, entity);
return Task.CompletedTask;
}
catch (Exception e)
@@ -422,18 +434,6 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
}
}
- ///
- /// 删除表单数据
- ///
- ///
主键
- ///
- [HttpPost]
- [AjaxOnly]
- public ActionResult DeleteForm(string keyValue)
- {
- noticeIBLL.DeleteEntity(keyValue);
- return Success("删除成功！");
- }
public void PushWeixin(List
needpostuserlist, string title)
{
var WeChatConfigentity = weChatConfigIbll.GetEnableEntity();
@@ -490,6 +490,47 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
}
}
}
+
+ ///
+ /// 消息提醒
+ ///
+ ///
+ ///
+ public void PushMessageRemind(List needpostuserlist, NewsEntity model)
+ {
+ foreach (UserEntity userinfo in needpostuserlist)
+ {
+ MessageRemindEntity entity = new MessageRemindEntity();
+ entity.ReceiptId = userinfo.F_UserId;
+ entity.ReceiptName = userinfo.F_RealName;
+ entity.SenderId = model.F_CreateUserId;
+ entity.SenderName = model.F_CreateUserName;
+ entity.TheTitle = "通知公告";
+ entity.TheContent = model.F_FullHead;
+ entity.InstanceId = model.F_NewsId;
+ entity.ConnectionUrl = "/Utility/ListContentIndex?id=";
+ entity.SendTime = DateTime.Now;
+ entity.ReadSigns = false;
+ messageRindIBLL.SaveEntity("", entity);
+ }
+
+ }
+
+
+ ///
+ /// 删除表单数据
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteForm(string keyValue)
+ {
+ noticeIBLL.DeleteEntity(keyValue);
+ return Success("删除成功！");
+ }
+
+
#endregion
#region 流程
@@ -517,11 +558,8 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
public ActionResult GetFormDataByProcessId(string processId)
{
NewsEntity OANewsData = noticeIBLL.GetEntityByProcessId(processId);
- var jsonData = new
- {
- OANews = OANewsData,
- };
- return Success(jsonData);
+ OANewsData.F_NewsContent = WebHelper.HtmlDecode(OANewsData.F_NewsContent);
+ return Success(OANewsData);
}
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Form.js
index 82580f68f..2ad166355 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Form.js
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
var postData = $('#form').lrGetFormData(keyValue);
postData["F_NewsContent"] = ue.getContent(null, null, true);
- $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveFormAndSubmit?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js
index 9088563e8..ef1686016 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js
@@ -61,17 +61,21 @@ var bootstrap = function ($, learun) {
setFormData = function (processId) {
if (!!processId) {
$.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetFormDataByProcessId?processId=' + processId, function (data) {
- for (var id in data) {
- if (!!data[id] && data[id].length > 0) {
- $('#' + id).jfGridSet('refreshdata', data[id]);
- }
- else {
- if (id == 'Sys_ReceiveFile') {
- keyValue = data[id].F_DeptRelationId;
- }
- $('[data-table="' + id + '"]').lrSetFormData(data[id]);
- }
- }
+ $('#form').lrSetFormData(data);
+ setTimeout(function () {
+ ue.setContent(data.F_NewsContent);
+ }, 100);
+ //for (var id in data) {
+ // if (!!data[id] && data[id].length > 0) {
+ // $('#' + id).jfGridSet('refreshdata', data[id]);
+ // }
+ // else {
+ // if (id == 'Sys_ReceiveFile') {
+ // keyValue = data[id].F_DeptRelationId;
+ // }
+ // $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ // }
+ //}
});
}
}
@@ -84,17 +88,62 @@ var bootstrap = function ($, learun) {
};
// 保存数据
save = function (processId, callBack, i) {
+
+ if (!$('#form').lrValidform()) {
+ return false;
+ }
var formData = $('body').lrGetFormData();
if (!!processId) {
formData.RProcessId = processId;
}
- $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, formData, function (res) {
- // 保存成功后才回调
- if (!!callBack) {
- callBack(res, formData, i);
+
+ learun.clientdata.getAsync('dataItem',
+ {
+ key: $("#F_CategoryId").lrselectGet(),
+ code: 'NoticeCategory',
+ callback: function (_data) {
+ $("#F_Category").val(_data.text);
+
+ var postData = $('#form').lrGetFormData(keyValue);
+ postData["F_NewsContent"] = ue.getContent(null, null, true);
+ $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue,
+ postData,
+ function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, formData, i);
+ }
+ });
+ }
+ });
+ //$.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, formData, function (res) {
+ // // 保存成功后才回调
+ // if (!!callBack) {
+ // callBack(res, formData, i);
+ // }
+ //});
+ };
+ acceptClick = function (callBack) {
+ if (!$('#form').lrValidform()) {
+ return false;
+ }
+ learun.clientdata.getAsync('dataItem', {
+ key: $("#F_CategoryId").lrselectGet(),
+ code: 'NoticeCategory',
+ callback: function (_data) {
+ $("#F_Category").val(_data.text);
+
+ var postData = $('#form').lrGetFormData(keyValue);
+ postData["F_NewsContent"] = ue.getContent(null, null, true);
+ $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
}
});
- };
+ }
page.init();
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
index 8b193d7b5..35efdc7f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
@@ -60,14 +60,10 @@ var bootstrap = function ($, learun) {
setFormData = function (processId, param, callback) {
if (!!processId) {
$.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetFormDataByProcessId?processId=' + processId, function (data) {
- for (var id in data) {
- if (!!data[id] && data[id].length > 0) {
- $('#' + id).jfGridSet('refreshdata', data[id]);
- }
- else {
- $('[data-table="' + id + '"]').lrSetFormData(data[id]);
- }
- }
+ $('#form').lrSetFormData(data);
+ setTimeout(function () {
+ ue.setContent(data.F_NewsContent);
+ }, 100);
});
}
callback && callback();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
index fc40d184c..636213d9f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
@@ -68,14 +68,15 @@ var bootstrap = function ($, learun) {
height: 650,
maxmin: true,
callBack: function (id) {
- return top[id].acceptClick(refreshGirdData);
+ //return top[id].acceptClick(refreshGirdData);
+ return top[id].save(refreshGirdData);
}
});
}
});
// 查看
$('#lr_view').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('SFileId');
+ var keyValue = $('#gridtable').jfGridValue('F_NewsId');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(",") != -1) {
learun.alert.warning("只能选择一条记录查看！");
@@ -85,8 +86,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '查看',
url: top.$.rootUrl + '/LR_OAModule/Notice/FormFlow?keyValue=' + keyValue,
- width: 800,
- height: 700,
+ width: 1000,
+ height: 650,
btn: null
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js
index 6ea627085..35509d693 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js
@@ -84,9 +84,7 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/Permission/DepartmentReleasePermissions/Index?departmentId=' + keyValue,
width: 700,
height: 400,
- callBack: function (id) {
- return top[id].acceptClick(refreshGirdData);
- }
+ btn:null
});
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
index 2488e7e83..74b4bd965 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js
@@ -373,7 +373,7 @@ var bootstrap = function ($, learun) {
isPage: true,
reloadSelected: true,
mainId: 'F_UserId',
- sidx: 'F_Order asc',
+ sidx: 'DeptOrder,F_Order,F_Account',
isMultiselect: true
});
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml
index 146e25bce..0f5e3ee8f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml
@@ -17,27 +17,27 @@
上班时间*
- @*
- @*
打卡次数*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
index 0fee97a93..2ba26bc5d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
@@ -80,11 +80,11 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
headData: [
{ label: "上班时间", name: "WorkTime", width: 100, align: "left" },
- //{ label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
- //{ label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
+ { label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
+ { label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
{ label: "下班时间", name: "CloseTime", width: 100, align: "left" },
- //{ label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
- //{ label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
+ { label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
+ { label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
{ label: "打卡次数", name: "ClockTime", width: 100, align: "left" },
{ label: "中午签退时间", name: "NoonCloseTime", width: 100, align: "left" },
{ label: "中午签退开始时间", name: "SignOutStartTime2", width: 150, align: "left" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
index 0685d5bdc..414447cd0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
@@ -113,6 +113,7 @@ namespace Learun.Application.Web.Controllers
#endregion
public ActionResult Index()
{
+ //判断登录状态码
string account = "";
if (!Request.Headers["account"].IsEmpty())
{
@@ -122,63 +123,48 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
-
return Redirect("NoLogin");
}
- var userinfo = LoginUserInfo.Get();
- var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
- var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
- var allCount = 0;
- foreach (var flow in flowType)
- {
- var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
- flow.FlowCount = count;
- allCount += count;
-
- }
-
- ViewBag.AllCount = allCount;
- ViewBag.FlowType = flowType;
- ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
-
-
- List
list = new List();
- List offenused = LogBLL.GetGroupLog(userinfo.userId).Select(m => m.F_Module).Take(20).ToList();
- var data = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress));
- foreach (var oitem in offenused)
- {
- ModuleEntity fod = data.FirstOrDefault(m => m.F_FullName == oitem);
- if (fod != null)
- {
- list.Add(fod);
- }
- }
- //常用服务
- ViewBag.Offenused = list.Take(12);
- //内部邮件
+ //登录用户
+ var userInfo = LoginUserInfo.Get();
+ ViewBag.UserId = userInfo.userId;
+ //桌面管理表、卡片块排序管理表增加默认数据
+ sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "one");
+ //获取桌面、卡片块排序列表
+ ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "one").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate);
+ ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList);
+ //分页查询条件设置
Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
- var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userinfo.userId + "\"}");
+ //邮件-收件箱
+ var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+ var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}");
ViewBag.LanMail = maildata;
- ViewBag.LanMailUnRead = maildata.Count(m => m.READFLAG == 0);
- //办公事项
- paginationobj.sidx = "F_CreateDate";
- //ViewBag.TaskList = wfTaskIBLL.GetActiveList(userinfo, paginationobj, "{}");
- ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userinfo, paginationobj, "{}");
-
+ ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail);
+ ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0);
+ //邮件-已发送
+ paginationobj.sidx = "SENDTIME desc";
+ var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+ var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}");
+ ViewBag.LanMailSend = mailsenddata;
+ ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend);
+ //来往邮件数量
+ ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count();
+ //公文
+ paginationobj.sidx = "SendTime";
+ ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}");
+ ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList);
//公告
List outnewslist = new List();
-
- paginationobj.rows = 100;
- var newsList = newsIBLL.GetList("", userinfo.userId);
+ var newsList = newsIBLL.GetList("", userInfo.userId);
foreach (var newsitemEntity in newsList)
{
if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
{
- if (!string.IsNullOrEmpty(userinfo.postIds))
+ if (!string.IsNullOrEmpty(userInfo.postIds))
{
- if (userinfo.postIds.Contains(","))
+ if (userInfo.postIds.Contains(","))
{
- foreach (var postid in userinfo.postIds.Split(','))
+ foreach (var postid in userInfo.postIds.Split(','))
{
if (newsitemEntity.F_SendPostId.Contains(postid))
{
@@ -189,7 +175,7 @@ namespace Learun.Application.Web.Controllers
}
else
{
- if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+ if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds))
{
outnewslist.Add(newsitemEntity);
}
@@ -200,7 +186,7 @@ namespace Learun.Application.Web.Controllers
{
if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
{
- if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+ if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId))
{
outnewslist.Add(newsitemEntity);
}
@@ -211,28 +197,233 @@ namespace Learun.Application.Web.Controllers
}
}
}
- //公文
- paginationobj.sidx = "SendTime";
- paginationobj.rows = 5;
- ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userinfo.userId + "\"}");
- ViewBag.NewsList = outnewslist;
- //底部办公事项
- ViewBag.FunctionTypeList = perm_FunctionTypeIBLL.GetListByUserId(userinfo.userId).OrderBy(m => m.FTOrder).Take(7);
- var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userinfo.userId);
- foreach (var ufitem in userfunctionlist)
+ ViewBag.NewsList = outnewslist.Take(5);
+ ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList);
+ //宣传报道
+ var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4);
+ foreach (var item in newsListOfxuanchuan)
{
- if (!string.IsNullOrEmpty(ufitem.FImage))
+ if (!string.IsNullOrEmpty(item.F_NewsImage))
{
- var imagePath = annexesFileIBLL.GetEntityByFolderId(ufitem.FImage)?.F_FilePath;
+ var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
if (!string.IsNullOrEmpty(imagePath))
{
- ufitem.FImage = imagePath.Substring(imagePath.IndexOf("Resource") - 1);
+ item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+ }
+ else
+ {
+ item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
}
}
}
- ViewBag.FunctionList = userfunctionlist;
- ViewBag.PublicKey = ConfigurationManager.AppSettings["SSOPublicSecret"];
- return View();
+ ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan;
+ ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan);
+ //智慧教育
+ ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6);
+ ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui);
+ //专题推荐
+ var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7);
+ foreach (var item in newsListOfzhuanti)
+ {
+ if (!string.IsNullOrEmpty(item.F_NewsImage))
+ {
+ var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
+ if (!string.IsNullOrEmpty(imagePath))
+ {
+ item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+ }
+ else
+ {
+ item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
+ }
+ }
+ }
+ ViewBag.NewsListOfzhuanti = newsListOfzhuanti;
+ ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti);
+ //办公事项-待办任务
+ paginationobj.sidx = "F_CreateDate";
+ paginationobj.rows = 4;
+ var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}");
+ ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}");
+ ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList);
+ ViewBag.TaskTotalNum = taskListAll.Count();
+ //办公事项-已办任务
+ var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}");
+ ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}");
+ ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList);
+ ViewBag.FinishTaskTotalNum = finishTaskListAll.Count();
+ //办公事项-我发起的
+ var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}");
+ ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}");
+ ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList);
+ ViewBag.MyListTotalNum = myListAll.Count();
+ //常用服务
+ List modulelist = new List();
+ List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();
+ var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId));
+ foreach (var oitem in offenused)
+ {
+ ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem);
+ if (fod != null)
+ {
+ //找父级
+ if (fod.F_ParentId == "0")
+ {
+ fod.ParentName = fod.F_FullName;
+ fod.F_ParentId = fod.F_ModuleId;
+ }
+ else
+ {
+ var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId);
+ if (parent1 != null)
+ {
+ if (parent1.F_ParentId == "0")
+ {
+ fod.ParentName = parent1.F_FullName;
+ fod.F_ParentId = parent1.F_ModuleId;
+ }
+ else
+ {
+ //下一级
+ var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId);
+ if (parent2 != null)
+ {
+ if (parent2.F_ParentId == "0")
+ {
+ fod.ParentName = parent2.F_FullName;
+ fod.F_ParentId = parent2.F_ModuleId;
+ }
+ else
+ {
+ //下一级
+ var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId);
+ if (parent3 != null)
+ {
+ if (parent3.F_ParentId == "0")
+ {
+ fod.ParentName = parent3.F_FullName;
+ fod.F_ParentId = parent3.F_ModuleId;
+ }
+ else
+ {
+ //下一级
+ var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId);
+ if (parent4 != null)
+ {
+ if (parent4.F_ParentId == "0")
+ {
+ fod.ParentName = parent4.F_FullName;
+ fod.F_ParentId = parent4.F_ModuleId;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ modulelist.Add(fod);
+ }
+ }
+ ViewBag.OffenusedAll = modulelist;
+
+ var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity()
+ {
+ F_ParentId = x.Key,
+ ParentName = x.FirstOrDefault().ParentName,
+ ChildrenList = x.Select(y => new ModuleEntity()
+ {
+ F_ModuleId = y.F_ModuleId,
+ F_FullName = y.F_FullName
+ }).ToList()
+ }).ToList();
+ ViewBag.OffenusedGroup = mm;
+ ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup);
+ //查找服务
+ List searchmodulelist = new List();
+ foreach (var item in moduledata)
+ {
+ if (moduleIBLL.GetColumnList(item.F_ModuleId).Any())
+ {
+ item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1);
+ searchmodulelist.Add(item);
+ }
+ }
+ ViewBag.SearchModule = searchmodulelist;
+ //校园总览
+ //专业
+ var majorData = cdMajorIBLL.GetAllList();
+ ViewBag.MajorTotalNum = majorData.Count();
+ //班级
+ var classInfoData = classInfoIBLL.GetAllClass();
+ ViewBag.ClassInfoTotalNum = classInfoData.Count();
+ //学生
+ var stuInfoData = stuInfoBasicIBLL.GetAllList();
+ ViewBag.StuInfoTotalNum = stuInfoData.Count();
+ //教师
+ var teacherData = empInfoIBLL.GetAllList();
+ ViewBag.TeacherTotalNum = teacherData.Count();
+ //教室
+ var classRoomData = classroomInfoIBLL.GetAllList();
+ ViewBag.ClassRoomTotalNum = classRoomData.Count();
+ //课程
+ var lessonData = lessonInfoIBLL.GetAllList();
+ ViewBag.LessonTotalNum = lessonData.Count();
+ //专业总览
+ //专业学生
+ var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new
+ {
+ value = x.Select(y => y.StuId).Count(),
+ name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+ });
+ ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
+ //流程
+ var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+ var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+ var allCount = 0;
+ foreach (var flow in flowType)
+ {
+ var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+ flow.FlowCount = count;
+ allCount += count;
+
+ }
+ ViewBag.AllCount = allCount;
+ ViewBag.FlowType = flowType;
+ ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+ //校园一卡通余额
+ ViewBag.StuSaveRecordTotalNum = 0;
+ var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE);
+ if (stuSaveRecordList.Any())
+ {
+ ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE;
+ }
+ //红湖付款码余额
+ ViewBag.StuConsumptionTotalNum = 0;
+ var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account);
+ if (stuConsumptionList.Any())
+ {
+ ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum();
+ }
+ //常用链接
+ var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId);
+ var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity()
+ {
+ FTName = x.Key,
+ PFunctionList = x.Select(y => new Perm_FunctionEntity()
+ {
+ FId = y.FId,
+ FTId = y.FTId,
+ FName = y.FName,
+ UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid
+ UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid
+ }).Take(8).ToList()
+ });
+ ViewBag.FunctionList = ff;
+ ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList);
+ return View("DragModelOne");
}
//public ActionResult NoLogin()
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
index be143f306..d56004641 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
@@ -16,7 +16,7 @@
-
+
@*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js
index 928cc635c..f185cd328 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js
@@ -1020,5 +1020,5 @@ var bootstrap = function ($, learun) {
}
};
- im.init();
+ //im.init();
};
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml
index 6e4872af9..ccad57e96 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml
@@ -21,9 +21,10 @@
统计指标
-
+
{b} : {c} ({d}%)" }; n.legend = { bottom: "bottom", data: m }; n.series = [{ name: "占比", type: "pie", radius: "75%", center: ["50%", "50%"], label: { normal: { formatter: "{b}:{c}: ({d}%)", textStyle: { fontWeight: "normal", fontSize: 12, color: "#333" } } }, data: l.value, itemStyle: { emphasis: { shadowBlur: 10, shadowOffsetX: 0, shadowColor: "rgba(0, 0, 0, 0.5)" } } }]; n.color = ["#df4d4b", "#304552", "#52bbc8", "rgb(224,134,105)", "#8dd5b4", "#5eb57d", "#d78d2f"]; break; case "1": n.tooltip = { trigger: "axis" }; n.grid = { bottom: "8%", containLabel: true }; n.xAxis = { type: "category", boundaryGap: false, data: m }; n.yAxis = { type: "value" }; n.series = [{ type: "line", data: p }]; break; case "2": n.tooltip = { trigger: "axis" }; n.grid = { bottom: "8%", containLabel: true }; n.xAxis = { type: "category", boundaryGap: false, data: m }; n.yAxis = { type: "value" }; n.series = [{ type: "bar", data: p }]; break }b[l.Id].setOption(n) } }) }); window.onresize = function (i) { $.each(b, function (j, k) { k.resize(i) }) } } } top.learun.clientdata.getAsync("desktop", { callback: function (g) { console.log(g); e(g.target || []); c(g.list || []); a(g.chart || []) } })
+});
+
+