Browse Source

【修改】我的桌面-公文接收:修改列表子项点击事件、更多点击事件;

金隅分支
dyy 3 years ago
parent
commit
432ab2cae7
4 changed files with 279 additions and 275 deletions
  1. +9
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs
  3. +265
    -265
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js
  4. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

+ 9
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js View File

@@ -6,6 +6,7 @@
*/
var acceptClick;
var keyValue = request('keyValue');
var isDesktop = request('isDesktop');//首页"我的桌面"中的"公文接收"列表子项的点击事件
var bootstrap = function ($, learun) {
"use strict";
var loginInfo = top.learun.clientdata.get(['userinfo']);
@@ -38,10 +39,14 @@ var bootstrap = function ($, learun) {
}

$('#SendType').lrDataItemSelect({ code: 'FileSendType' });
if (selectedRow.ReadFlag == true) {//已读
$('#Url').lrUploader();
} else {//未读
$('#Url').lrUploader({ RFileId: selectedRow.RFileId });
if (isDesktop != "1") {
if (selectedRow.ReadFlag == true) {//已读
$('#Url').lrUploader();
} else {//未读
$('#Url').lrUploader({ RFileId: selectedRow.RFileId });
}
} else {
$('#Url').lrUploader({ RFileId: keyValue });
}
},
initData: function () {
@@ -63,7 +68,6 @@ var bootstrap = function ($, learun) {
'/EducationalAdministration/Sys_ReceiveFile/GetInstructions?keyValue=' +
keyValue,
'');
console.log(data);

$('#gridtable').jfGrid({
headData: [


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs View File

@@ -192,7 +192,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
if (dtListEntity.F_Name.Contains("公文接收"))
{
dtListEntity.F_Sql =
"SELECT Title as f_title,SendTime as f_time FROM dbo.Sys_ReceiveFile WHERE DelFlag=0 AND ReadFlag<>1 and STypeId=4 AND ReceiverId='" +
"SELECT RFileId as F_Id,Title as f_title,SendTime as f_time FROM dbo.Sys_ReceiveFile WHERE DelFlag=0 AND ReadFlag<>1 and STypeId=4 AND ReceiverId='" +
loginUserInfo.userId + "'";
}



+ 265
- 265
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js View File

@@ -1,273 +1,273 @@
$(function() {
var f = {};
var d = {};
$(function () {
var f = {};
var d = {};

function e(i) {
function e(i) {

top.learun.httpSync('get', top.$.rootUrl + '/LR_Desktop/DTTitle/GetID', '{}', function(res) {
var background = res.Background;
var color = res.Color;
if(background){
$("#TitleColor").css({background: background, color: color, borderColor: 'transparent'})
}
})
top.learun.httpSync('get', top.$.rootUrl + '/LR_Desktop/DTTitle/GetID', '{}', function (res) {
var background = res.Background;
var color = res.Color;
if (background) {
$("#TitleColor").css({ background: background, color: color, borderColor: 'transparent' })
}

if(i.length > 0) {
$("#lr_target").lrscroll();
var j = 210;
var h = 0;
var k = $("#lr_target").width() - 10;
var j = k / i.length;
if(j < 210) {
j = 210
}
h = j * i.length;
var g = $("#lr_target .lr-scroll-box");
g.css("width", h);
$.each(i,
function(m, n) {
f[n.F_Id] = n;
var l = ' <div class="lr-item-20"> <div class="task-stat" > <div class="visual"> <i class="' + n.F_Icon + '"></i> </div> <div class="details"> <div class="number" data-value="' + n.F_Id + '"></div> <div class="desc">' + n.F_Name + "</div> </div>";
if(n.F_Url) {
l += '<a class="more" data-Id="' + n.F_Id + '" > 查看更多 <i class="fa fa-arrow-circle-right"></i> </a>'
}
l += "</div> </div>";
g.append(l);
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTTarget/GetSqlData", {
Id: n.F_Id
},
function(o) {
if(o) {
g.find('[data-value="' + o.Id + '"]').text(o.value)
}
})
});
g.find(".lr-item-20 .more").on("click",
function() {
var l = $(this).attr("data-Id");
top.learun.frameTab.open({
F_ModuleId: l,
F_FullName: f[l].F_Name,
F_UrlAddress: f[l].F_Url
});
return false
});
g.find(".lr-item-20").css("width", j);
$("#lr_target").resize(function() {
var m = $("#lr_target").width() - 10;
var l = m / i.length;
if(l < 210) {
l = 210
}
h = l * i.length;
g.css("width", h);
g.find(".lr-item-20").css("width", l)
})
}
}
})

function c(h) {
if(h.length > 0) {
var g = $(".lr-desktop-panel>.lr-scroll-box");
$.each(h,
function(j, k) {
d[k.F_Id] = k;
var stylex = k.Background? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : '';
var i = '<div class="col-xs-6" data-Id="' + k.F_Id + '"> <div style="'+ stylex +'" class="portal-panel-title "><i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '<span class="menu" title="更多"> <span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span> </span> </div> <div class="portal-panel-content" style="overflow: hidden;padding-top: 20px; padding-left: 30px; padding-right: 50px;height:225px;" data-value="' + k.F_Id + '" ></div></div>';
g.append(i);
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTList/GetSqlData", {
Id: k.F_Id
},
if (i.length > 0) {
$("#lr_target").lrscroll();
var j = 210;
var h = 0;
var k = $("#lr_target").width() - 10;
var j = k / i.length;
if (j < 210) {
j = 210
}
h = j * i.length;
var g = $("#lr_target .lr-scroll-box");
g.css("width", h);
$.each(i,
function (m, n) {
f[n.F_Id] = n;
var l = ' <div class="lr-item-20"> <div class="task-stat" > <div class="visual"> <i class="' + n.F_Icon + '"></i> </div> <div class="details"> <div class="number" data-value="' + n.F_Id + '"></div> <div class="desc">' + n.F_Name + "</div> </div>";
if (n.F_Url) {
l += '<a class="more" data-Id="' + n.F_Id + '" > 查看更多 <i class="fa fa-arrow-circle-right"></i> </a>'
}
l += "</div> </div>";
g.append(l);
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTTarget/GetSqlData", {
Id: n.F_Id
},
function (o) {
if (o) {
g.find('[data-value="' + o.Id + '"]').text(o.value)
}
})
});
g.find(".lr-item-20 .more").on("click",
function () {
var l = $(this).attr("data-Id");
top.learun.frameTab.open({
F_ModuleId: l,
F_FullName: f[l].F_Name,
F_UrlAddress: f[l].F_Url
});
return false
});
g.find(".lr-item-20").css("width", j);
$("#lr_target").resize(function () {
var m = $("#lr_target").width() - 10;
var l = m / i.length;
if (l < 210) {
l = 210
}
h = l * i.length;
g.css("width", h);
g.find(".lr-item-20").css("width", l)
})
}
}

function c(h) {
if (h.length > 0) {
var g = $(".lr-desktop-panel>.lr-scroll-box");
$.each(h,
function (j, k) {
d[k.F_Id] = k;
var stylex = k.Background ? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : '';
var i = '<div class="col-xs-6" data-Id="' + k.F_Id + '"> <div style="' + stylex + '" class="portal-panel-title "><i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '<span class="menu" title="更多"> <span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span> </span> </div> <div class="portal-panel-content" style="overflow: hidden;padding-top: 20px; padding-left: 30px; padding-right: 50px;height:225px;" data-value="' + k.F_Id + '" ></div></div>';
g.append(i);
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTList/GetSqlData", {
Id: k.F_Id
},
function (m) {
if(m) {
var l = g.find('[data-value="' + m.Id + '"]');
$.each(m.value,
function(p, q) {
if (m) {
var l = g.find('[data-value="' + m.Id + '"]');
$.each(m.value,
function (p, q) {
var o = ' <div class="lr-msg-line"> <a href="#" style="text-decoration: none;" >' + q.f_title + "</a> <label>" + (q.f_time != '' && q.f_time != undefined && q.f_time != null ? q.f_time.slice(0, 10) : '') + "</label> </div>";
var n = $(o);
n.find("a")[0].item = q;
l.append(n)
});
l.find(".lr-msg-line>a").on("click",
function() {
var n = $(this).parents(".col-xs-6");
var o = n.attr("data-Id");
var p = $(this)[0].item;
if(d[o].F_ItemUrl) {
top.learun.frameTab.open({
F_ModuleId: "dtlist" + p.f_id,
F_FullName: p.f_title,
F_UrlAddress: d[o].F_ItemUrl + p.f_id
})
} else {
//判断点击项是否为‘待办’的子项
if(d[o].F_Id == "33d50f1a-a64d-4b86-a6d4-2d937226de95") {
if(p.f_tasktype != 2) {
top.learun.frameTab.open({
F_ModuleId: p.f_id + "_homeopen",
F_Icon: 'fa magic',
F_FullName: '审核流程【' + p.f_processname + '/' + p.f_content + '】',
F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/Index'
//F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id
});
}
} else {
top["dtlist" + p.f_id] = p;
top.learun.frameTab.open({
F_ModuleId: "dtlist" + p.f_id,
F_FullName: p.f_title,
F_UrlAddress: "/Utility/ListContentIndex?id=" + p.f_id
})
}
}
return false
})
}
})
});
//青桔课堂图片插入
var htmlQj = '<div class="col-xs-12" id="qjImg" style="position: relative;border-radius: 4px;overflow: hidden;">' +
'<a href="/Home/GoQingJu" target="_blank"><img src="/Content/images/qj.jpg" alt="" style="width: 100%;display: block;margin: 20px 0 10px" /></a>' +
'<div class="qjClose" style="background: #7c89f3;border-radius: 2px;text-align: center;line-height: 24px;width: 50px;font-size: 12px;color: #fff;position: absolute;top: 31px;right: 13px;height: 24px;cursor: pointer;">关闭</div>' +
'</div>';
//g.append(htmlQj);
g.find(".portal-panel-title>.menu").on("click",
function() {
var i = $(this).parents(".col-xs-6");
var j = i.attr("data-Id");
top.learun.frameTab.open({
F_ModuleId: j,
F_FullName: d[j].F_Name,
F_UrlAddress: d[j].F_Url
});
return false
}).end().on('click', '.qjClose', function() {
$(this).parent().addClass('active').slideUp(500)
});
if(h.length % 2 > 0) {
g.find('[data-value="' + h[h.length - 1].F_Id + '"]').css("height", 425)
}
}
}
var b = {};
var n = $(o);
n.find("a")[0].item = q;
l.append(n)
});
l.find(".lr-msg-line>a").on("click",
function () {
var n = $(this).parents(".col-xs-6");
var o = n.attr("data-Id");
var p = $(this)[0].item;
if (d[o].F_ItemUrl) {
top.learun.frameTab.open({
F_ModuleId: "dtlist" + p.f_id,
F_FullName: p.f_title,
F_UrlAddress: d[o].F_ItemUrl + p.f_id
})
} else {
//判断点击项是否为‘待办’的子项
if (d[o].F_Id == "33d50f1a-a64d-4b86-a6d4-2d937226de95") {
if (p.f_tasktype != 2) {
top.learun.frameTab.open({
F_ModuleId: p.f_id + "_homeopen",
F_Icon: 'fa magic',
F_FullName: '审核流程【' + p.f_processname + '/' + p.f_content + '】',
F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/Index'
//F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id
});
}
} else {
top["dtlist" + p.f_id] = p;
top.learun.frameTab.open({
F_ModuleId: "dtlist" + p.f_id,
F_FullName: p.f_title,
F_UrlAddress: "/Utility/ListContentIndex?id=" + p.f_id
})
}
}
return false
})
}
})
});
//青桔课堂图片插入
var htmlQj = '<div class="col-xs-12" id="qjImg" style="position: relative;border-radius: 4px;overflow: hidden;">' +
'<a href="/Home/GoQingJu" target="_blank"><img src="/Content/images/qj.jpg" alt="" style="width: 100%;display: block;margin: 20px 0 10px" /></a>' +
'<div class="qjClose" style="background: #7c89f3;border-radius: 2px;text-align: center;line-height: 24px;width: 50px;font-size: 12px;color: #fff;position: absolute;top: 31px;right: 13px;height: 24px;cursor: pointer;">关闭</div>' +
'</div>';
//g.append(htmlQj);
g.find(".portal-panel-title>.menu").on("click",
function () {
var i = $(this).parents(".col-xs-6");
var j = i.attr("data-Id");
top.learun.frameTab.open({
F_ModuleId: j,
F_FullName: d[j].F_Name,
F_UrlAddress: d[j].F_Url
});
return false
}).end().on('click', '.qjClose', function () {
$(this).parent().addClass('active').slideUp(500)
});
if (h.length % 2 > 0) {
g.find('[data-value="' + h[h.length - 1].F_Id + '"]').css("height", 425)
}
}
}
var b = {};

function a(h) {
if(h.length > 0) {
var g = $(".lr-desktop-panel>.lr-scroll-box");
$.each(h,
function(j, k) {
var stylex = k.Background? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : '';
var i = ' <div class="col-xs-' + (12 / parseInt(k.F_Proportion1)) + '"> <div style="'+ stylex+'" class="portal-panel-title"> <i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + ' </div> <div class="portal-panel-content"> <div id="' + k.F_Id + '" class="lr-chart-container" data-type="' + k.F_Type + '" ></div> </div> </div>';
g.append(i);
b[k.F_Id] = echarts.init(document.getElementById(k.F_Id));
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTChart/GetSqlData", {
Id: k.F_Id
},
function(l) {
if(l) {
var o = $("#" + l.Id).attr("data-type");
var m = [];
var p = [];
$.each(l.value,
function(q, r) {
m.push(r.name);
p.push(r.value)
});
var n = {};
switch(o) {
case "0":
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)
})
}
}
}
$(".lr-desktop-panel").lrscroll();
top.learun.clientdata.getAsync("desktop", {
callback: function(g) {
e(g.target || []);
c(g.list || []);
a(g.chart || [])
}
})
function a(h) {
if (h.length > 0) {
var g = $(".lr-desktop-panel>.lr-scroll-box");
$.each(h,
function (j, k) {
var stylex = k.Background ? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : '';
var i = ' <div class="col-xs-' + (12 / parseInt(k.F_Proportion1)) + '"> <div style="' + stylex + '" class="portal-panel-title"> <i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + ' </div> <div class="portal-panel-content"> <div id="' + k.F_Id + '" class="lr-chart-container" data-type="' + k.F_Type + '" ></div> </div> </div>';
g.append(i);
b[k.F_Id] = echarts.init(document.getElementById(k.F_Id));
top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTChart/GetSqlData", {
Id: k.F_Id
},
function (l) {
if (l) {
var o = $("#" + l.Id).attr("data-type");
var m = [];
var p = [];
$.each(l.value,
function (q, r) {
m.push(r.name);
p.push(r.value)
});
var n = {};
switch (o) {
case "0":
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)
})
}
}
}
$(".lr-desktop-panel").lrscroll();
top.learun.clientdata.getAsync("desktop", {
callback: function (g) {
e(g.target || []);
c(g.list || []);
a(g.chart || [])
}
})
});

+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config View File

@@ -2,13 +2,13 @@
<connectionStrings>
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<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="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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" 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" />-->
<!--demo.quanjiang.com-->
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />


Loading…
Cancel
Save