1、系统菜单调整;
2、系统看板UI调整; 3、事故事件功能 4、其他
This commit is contained in:
@@ -1,10 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Security;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using BLL;
|
||||
|
||||
namespace FineUIPro.Web.InterFace
|
||||
@@ -49,6 +44,11 @@ namespace FineUIPro.Web.InterFace
|
||||
this.drpUnit.DataValueField = "UnitId";
|
||||
this.drpUnit.DataSource = BLL.UnitService.GetUnitDropDownList();
|
||||
drpUnit.DataBind();
|
||||
|
||||
this.drpAuthUnit.DataTextField = "UnitName";
|
||||
this.drpAuthUnit.DataValueField = "UnitId";
|
||||
this.drpAuthUnit.DataSource = BLL.UnitService.GetUnitDropDownList();
|
||||
drpAuthUnit.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpUnit);
|
||||
if (!string.IsNullOrEmpty(this.InterFaceSetId))
|
||||
{
|
||||
@@ -62,14 +62,7 @@ namespace FineUIPro.Web.InterFace
|
||||
this.drpUnit.SelectedValue = unit.UnitId;
|
||||
}
|
||||
}
|
||||
|
||||
var list = (from x in Funs.DB.Base_Unit
|
||||
orderby x.UnitName
|
||||
select new { x.UnitName, x.UnitId }).ToList();
|
||||
foreach (var item in list)
|
||||
{
|
||||
this.rbAuthUnits.Items.Add(item.UnitName, item.UnitId);
|
||||
}
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(this.InterFaceSetId))
|
||||
{
|
||||
@@ -89,10 +82,11 @@ namespace FineUIPro.Web.InterFace
|
||||
this.IsCallBack.Checked =(bool) FaceSet.IsCallBack;
|
||||
if (!string.IsNullOrEmpty(FaceSet.AuthUnitIds))
|
||||
{
|
||||
this.drpAuthUnit.Values = FaceSet.AuthUnitIds.Split(',');
|
||||
this.drpAuthUnit.SelectedValueArray = FaceSet.AuthUnitIds.Split(',');
|
||||
}
|
||||
|
||||
this.txtRemarks.Text = FaceSet.TxtRemarks;
|
||||
txtRequestJsonBody.Text = FaceSet.RequestJsonBody;
|
||||
if (FaceSet.IsOpen.HasValue)
|
||||
{
|
||||
this.drpIsOpen.SelectedValue = Convert.ToString(FaceSet.IsOpen);
|
||||
@@ -109,8 +103,15 @@ namespace FineUIPro.Web.InterFace
|
||||
{
|
||||
this.DrpCallBackUrlReqMethod.SelectedValue = FaceSet.CallBackUrlReqMethod;
|
||||
}
|
||||
|
||||
if (FaceSet.IsSingleRequest != null) cbIsSingleRequest.Checked = (bool)FaceSet.IsSingleRequest;
|
||||
cbIsSingleRequest_OnCheckedChanged(null, null);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cbIsSingleRequest_OnCheckedChanged(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,24 +133,10 @@ namespace FineUIPro.Web.InterFace
|
||||
//目标单位
|
||||
string AuthUnitId = string.Empty;
|
||||
string AuthUnitName = string.Empty;
|
||||
string UnitId = string.Empty;
|
||||
foreach (var item in this.drpAuthUnit.Values)
|
||||
{
|
||||
if (item != "")
|
||||
{
|
||||
AuthUnitId += item + ",";
|
||||
}
|
||||
}
|
||||
foreach (var item in this.drpAuthUnit.Texts)
|
||||
{
|
||||
if (item != "")
|
||||
{
|
||||
AuthUnitName += item + ",";
|
||||
|
||||
}
|
||||
}
|
||||
AuthUnitId = AuthUnitId.Substring(0, AuthUnitId.LastIndexOf(","));
|
||||
AuthUnitName = AuthUnitName.Substring(0, AuthUnitName.LastIndexOf(","));
|
||||
string UnitId = string.Empty;
|
||||
|
||||
AuthUnitId = string.Join(",", drpAuthUnit.SelectedValueArray);
|
||||
AuthUnitName = UnitService.getUnitNamesUnitIds(AuthUnitId);
|
||||
if (this.drpUnit.SelectedValue != Const._Null)
|
||||
{
|
||||
UnitId = this.drpUnit.SelectedValue;
|
||||
@@ -168,7 +155,9 @@ namespace FineUIPro.Web.InterFace
|
||||
InterFaceCallBackUrl = txtCallBackUrl.Text,
|
||||
UrlReqMethod=DrpUrlReqMethod.SelectedValue.Trim(),
|
||||
ForUrlReqMethod=DrpForUrlReqMethod.SelectedValue.Trim(),
|
||||
CallBackUrlReqMethod=DrpCallBackUrlReqMethod.SelectedValue.Trim()
|
||||
CallBackUrlReqMethod=DrpCallBackUrlReqMethod.SelectedValue.Trim(),
|
||||
IsSingleRequest = cbIsSingleRequest.Checked,
|
||||
RequestJsonBody = txtRequestJsonBody.Text.Trim(),
|
||||
|
||||
};
|
||||
if (string.IsNullOrEmpty(this.InterFaceSetId))
|
||||
@@ -195,7 +184,7 @@ namespace FineUIPro.Web.InterFace
|
||||
/// <returns></returns>
|
||||
private void GetButtonPower()
|
||||
{
|
||||
var buttonList = BLL.CommonService.GetAllButtonList(null,this.CurrUser.UserId, BLL.Const.InterFaceSetMenuId);
|
||||
var buttonList = BLL.CommonService.GetAllButtonList(string.Empty, this.CurrUser.UserId, BLL.Const.UserMenuId);
|
||||
if (buttonList.Count() > 0)
|
||||
{
|
||||
if (buttonList.Contains(BLL.Const.BtnSave))
|
||||
@@ -218,5 +207,23 @@ namespace FineUIPro.Web.InterFace
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void cbIsSingleRequest_OnCheckedChanged(object sender, CheckedEventArgs e)
|
||||
{
|
||||
if (cbIsSingleRequest.Checked == true)
|
||||
{
|
||||
this.rowFace.Hidden = false;
|
||||
this.rowFaceFor.Hidden = true;
|
||||
this.rowCallBack.Hidden = true;
|
||||
txtRequestJsonBody.Hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.rowFace.Hidden = false;
|
||||
this.rowFaceFor.Hidden = false;
|
||||
this.rowCallBack.Hidden = false;
|
||||
txtRequestJsonBody.Hidden = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user