check bugs

This commit is contained in:
yubaolee 2017-02-28 16:51:07 +08:00
parent 02742c5ad4
commit 91dfa83e6f
7 changed files with 83 additions and 58 deletions

View File

@ -169,38 +169,6 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
}
#endregion
#region
/// <summary>
/// 用户列表树
/// </summary>
/// <returns>返回树形Json</returns>
[HttpGet]
public ActionResult GetUserCheckTreeJson()
{
var data = userBLL.Load(Guid.Empty, 1, 10);
var treeList = new List<TreeEntity>();
string companyid = "";
string departmentid = "";
foreach (UserView item in data.rows)
{
TreeEntity tree = new TreeEntity();
tree.id = item.Id.ToString();
tree.text = item.Name;
tree.value = item.Id.ToString();
tree.isexpand = true;
tree.complete = true;
tree.hasChildren = false;
tree.parentId = "0";
tree.showcheck = true;
tree.img = "fa fa-user";
tree.Attribute = "mytype";
tree.AttributeValue = "User";
treeList.Add(tree);
}
return Content(treeList.TreeToJson());
}
#endregion
}
}

View File

@ -135,7 +135,7 @@
/*=========基本配置end====================================================================*/
function GetTree(type) {
$.SetForm({
url: "../../FlowManage/FlowDesign/Get" + type + "CheckTreeJson",
url: "/UserManager/Get" + type + "CheckTreeJson",
success: function (data) {
AllAuthorizeCheckData[type] = $.arrayClone(data);
//var item = {

View File

@ -3,6 +3,7 @@
Layout = "~/Views/Shared/_FlowForm.cshtml";
}
<link href="~/Content/styles/flow.css" rel="stylesheet" />
<script src="~/BllScripts/clientData.js"></script>
<script>
var keyValue = request('keyValue');
var schemeVersion = request('schemeVersion');

View File

@ -0,0 +1,19 @@
$(function() {
$.getclientdata();
});
var clientuserData = [];
$.getclientdata = function () {
$.ajax({
url: "/UserManager/GetAccessedUsers",
type: "get",
dataType: "json",
async: false,
success: function (data) {
clientuserData = data;
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log("加载可访问的用户列表失败!");
}
});
}

View File

@ -233,10 +233,10 @@ $.fn.flowdesign = function (options) {
}
if (item.setInfo != undefined && item.setInfo.Taged != undefined)
{
// var _one = top.clientuserData[item.setInfo.UserId];
var _one = clientuserData[item.setInfo.UserId];
var _row = '<div style="text-align:left">';
var tagname = { "-1": "不通过", "1": "通过", "0": "驳回" };
_row += "<p>处理人:" + ( item.setInfo.UserId )+"</p>";
_row += "<p>处理人:" + (_one == undefined ? item.setInfo.UserId : _one.RealName) + "</p>";
_row += "<p>结果:" + tagname[item.setInfo.Taged] + "</p>";
_row += "<p>处理时间:" + item.setInfo.TagedTime + "</p>";
_row += "<p>备注:" + item.setInfo.description + "</p></div>";
@ -307,30 +307,10 @@ $.fn.flowdesign = function (options) {
}
}
_rowstr = "";
for (var i in item.setInfo.NodeDesignateData.post) {
var _postitem = item.setInfo.NodeDesignateData.post[i];
var _one = top.clientpostData[_postitem];
_rowstr += ' <span class="label label-info">' + (_one == undefined ? _postitem : _one.FullName) + '</span>';
if (i == item.setInfo.NodeDesignateData.post.length - 1) {
_popoverhtml += '<li>岗位:' + _rowstr + '</li>';
}
}
_rowstr = "";
for (var i in item.setInfo.NodeDesignateData.usergroup) {
var _postitem = item.setInfo.NodeDesignateData.usergroup[i];
var _one = top.clientuserGroup[_postitem];
_rowstr += ' <span class="label label-warning">' + (_one == undefined ? _postitem : _one.FullName) + '</span>';
if (i == item.setInfo.NodeDesignateData.usergroup.length - 1) {
_popoverhtml += '<li>用户组:' + _rowstr + '</li>';
}
}
_rowstr = "";
for (var i in item.setInfo.NodeDesignateData.user) {
var _postitem = item.setInfo.NodeDesignateData.user[i];
var _one = top.clientuserData[_postitem];
var _one = clientuserData[_postitem];
_rowstr += ' <span class="label label-danger">' + (_one == undefined ? _postitem : _one.RealName) + '</span>';
if (i == item.setInfo.NodeDesignateData.user.length - 1) {
_popoverhtml += '<li>用户:' + _rowstr + '</li>';

View File

@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using Infrastructure;
using LeaRun.Util.WebControl;
using OpenAuth.App;
using OpenAuth.App.ViewModel;
using OpenAuth.Domain;
using OpenAuth.Mvc.Models;
namespace OpenAuth.Mvc.Controllers
@ -66,6 +69,59 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(Result);
}
#region
/// <summary>
/// 用户列表树
/// </summary>
/// <returns>返回树形Json</returns>
[HttpGet]
public ActionResult GetUserCheckTreeJson()
{
var treeList = new List<TreeEntity>();
string companyid = "";
string departmentid = "";
foreach (UserView item in _app.Load(Guid.Empty, 1, 10).rows)
{
TreeEntity tree = new TreeEntity();
tree.id = item.Id.ToString();
tree.text = item.Name;
tree.value = item.Id.ToString();
tree.isexpand = true;
tree.complete = true;
tree.hasChildren = false;
tree.parentId = "0";
tree.showcheck = true;
tree.img = "fa fa-user";
tree.Attribute = "mytype";
tree.AttributeValue = "User";
treeList.Add(tree);
}
return Content(treeList.TreeToJson());
}
/// <summary>
/// 获取用户可访问的账号
/// <para>李玉宝于2017-02-28 15:12:19</para>
/// </summary>
public string GetAccessedUsers()
{
IEnumerable<UserView> users = _app.Load(Guid.Empty, 1, 10).rows;
var result = new Dictionary<string , object>();
foreach (var user in users)
{
var item = new
{
Account = user.Account,
RealName = user.Name,
};
result.Add(user.Id.ToString(), item);
}
return JsonHelper.Instance.Serialize(result);
}
#endregion
}
}

View File

@ -395,6 +395,7 @@
<Content Include="Content\scripts\plugins\flow-ui\img\gooflow_icon.png" />
<Content Include="Content\scripts\plugins\flow-ui\img\gooflow_icon2.png" />
<Content Include="Content\scripts\plugins\flow-ui\img\gooflow_tip.png" />
<Content Include="BllScripts\clientData.js" />
<Content Include="Content\scripts\zTree\css\awesomeStyle\awesome.css" />
<Content Include="Content\scripts\zTree\css\awesomeStyle\img\loading.gif" />
<Content Include="Content\scripts\zTree\css\demo.css" />