Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
05e9432c5b
|
|
@ -1,4 +1,13 @@
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE Solution_LargerHazard
|
||||||
|
ADD CONSTRAINT DF_Solution_LargerHazard_TrainPersonNum DEFAULT 0 FOR TrainPersonNum;
|
||||||
|
go
|
||||||
|
ALTER TABLE Comprehensive_MajorPlanApproval
|
||||||
|
ADD CONSTRAINT DF_Comprehensive_MajorPlanApproval_TrainPersonNum DEFAULT 0 FOR TrainPersonNum;
|
||||||
|
go
|
||||||
|
|
||||||
|
|
||||||
ALTER TABLE Solution_LargerHazard ALTER COLUMN Address nvarchar(500);
|
ALTER TABLE Solution_LargerHazard ALTER COLUMN Address nvarchar(500);
|
||||||
go
|
go
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1297,6 +1297,145 @@ namespace BLL
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
//string mess = string.Empty;
|
||||||
|
//string sucess = string.Empty;
|
||||||
|
//string code = string.Empty;
|
||||||
|
//string data = string.Empty;
|
||||||
|
//string pushContent = string.Empty;
|
||||||
|
//string contenttype = "application/json;charset=unicode";
|
||||||
|
//var getData = (from x in Funs.DB.SitePerson_Person
|
||||||
|
// join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
|
||||||
|
// join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
|
||||||
|
// join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
|
||||||
|
// join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
|
||||||
|
// where x.IdentityCard == identityCard && y.ContractNo == proCode
|
||||||
|
// && v.TeamId.HasValue && z.JTproCode != null
|
||||||
|
// && ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || (type == Const.BtnModify && x.RealNameAddTime.HasValue))
|
||||||
|
// select new
|
||||||
|
// {
|
||||||
|
// name = x.PersonName,
|
||||||
|
// idcardType = "SHENFEN_ZHENGJIAN",
|
||||||
|
// idcardNumber = x.IdentityCard,
|
||||||
|
// idcardStartDate = x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate) : null,
|
||||||
|
// idcardEndDate = x.IdcardEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate) : (x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate.Value.AddYears(30)) : null),
|
||||||
|
// idcardForever = x.IdcardStartDate.HasValue ? "N" : "Y",
|
||||||
|
// politicsStatus = x.PoliticsStatus,
|
||||||
|
// eduLevel = x.EduLevel,
|
||||||
|
// maritalStatus = x.MaritalStatus,
|
||||||
|
// sex = (x.Sex == "2" ? "F" : "M"),
|
||||||
|
// idcardAddress = x.IdcardAddress,
|
||||||
|
// homeAddress = x.Address,
|
||||||
|
// birthday = x.Birthday.HasValue ? string.Format("{0:yyyy-MM-dd}", x.Birthday) : null,
|
||||||
|
// nation = x.Nation,
|
||||||
|
// countryCode = x.CountryCode,
|
||||||
|
// provinceCode = x.ProvinceCode,
|
||||||
|
// headImage = x.HeadImage,
|
||||||
|
// proCode = z.JTproCode,
|
||||||
|
// teamId = v.TeamId,
|
||||||
|
// mobile = x.Telephone,
|
||||||
|
// teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"),
|
||||||
|
// userType = ((w.PostType == "1" || w.PostType == "4") ? "LAB_USER_MANAGE" : "LAB_USER_BULIDER"),
|
||||||
|
// workType = w.WorkPostCode,
|
||||||
|
// isLeave = x.OutTime.HasValue ? "Y" : "N",
|
||||||
|
// entryTime = x.InTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.InTime) : null,
|
||||||
|
// exitTime = x.OutTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.OutTime) : null,
|
||||||
|
// x.RealNameAddTime,
|
||||||
|
// x.RealNameUpdateTime,
|
||||||
|
// x.PersonId,
|
||||||
|
// }).ToList();
|
||||||
|
//if (getData.Count() > 0)
|
||||||
|
//{
|
||||||
|
// string returndata = string.Empty;
|
||||||
|
// Hashtable newToken = new Hashtable
|
||||||
|
// {
|
||||||
|
// { "token", getaccess_token(proCode) }
|
||||||
|
// };
|
||||||
|
// if (type == Const.BtnModify)
|
||||||
|
// {
|
||||||
|
// var updatelistObject = new
|
||||||
|
// {
|
||||||
|
// list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||||
|
// };
|
||||||
|
// pushContent = JsonConvert.SerializeObject(updatelistObject);
|
||||||
|
// returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, pushContent);
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// var addlistObject = new
|
||||||
|
// {
|
||||||
|
// list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.headImage, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||||
|
// };
|
||||||
|
// pushContent = JsonConvert.SerializeObject(addlistObject);
|
||||||
|
// returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (!string.IsNullOrEmpty(returndata))
|
||||||
|
// {
|
||||||
|
// JObject obj = JObject.Parse(returndata);
|
||||||
|
// mess = obj["message"].ToString();
|
||||||
|
// code = obj["code"].ToString();
|
||||||
|
// sucess = obj["success"].ToString();
|
||||||
|
// data = obj["data"].ToString();
|
||||||
|
// if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
|
||||||
|
// {
|
||||||
|
// using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||||
|
// {
|
||||||
|
// foreach (var item in getData)
|
||||||
|
// {
|
||||||
|
// var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == item.PersonId);
|
||||||
|
// if (getPerson != null)
|
||||||
|
// {
|
||||||
|
// if (!getPerson.RealNameAddTime.HasValue)
|
||||||
|
// {
|
||||||
|
// getPerson.RealNameAddTime = DateTime.Now;
|
||||||
|
// }
|
||||||
|
// if (type == Const.BtnModify)
|
||||||
|
// {
|
||||||
|
// getPerson.RealNameUpdateTime = DateTime.Now;
|
||||||
|
// }
|
||||||
|
// db.SubmitChanges();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// if (mess.Contains("token无效"))
|
||||||
|
// {
|
||||||
|
// getaccess_token_New(proCode);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
|
||||||
|
// if (data.Contains("已存在") || mess.Contains("已存在"))
|
||||||
|
// {
|
||||||
|
// using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||||
|
// {
|
||||||
|
// foreach (var item in getData)
|
||||||
|
// {
|
||||||
|
// if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber))
|
||||||
|
// {
|
||||||
|
// var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == item.PersonId);
|
||||||
|
// if (getPerson != null)
|
||||||
|
// {
|
||||||
|
// if (!getPerson.RealNameAddTime.HasValue)
|
||||||
|
// {
|
||||||
|
// getPerson.RealNameAddTime = DateTime.Now;
|
||||||
|
// }
|
||||||
|
// db.SubmitChanges();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// mess = "没有符合条件的数据！";
|
||||||
|
//}
|
||||||
|
|
||||||
|
//return mess;
|
||||||
string mess = string.Empty;
|
string mess = string.Empty;
|
||||||
string sucess = string.Empty;
|
string sucess = string.Empty;
|
||||||
string code = string.Empty;
|
string code = string.Empty;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,114 @@
|
||||||
|
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JD.aspx.cs" Inherits="FineUIPro.Web.DataShow.JD" %>
|
||||||
|
|
||||||
|
<!DOCTYPE html>
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head runat="server">
|
||||||
|
<title>进度情况</title>
|
||||||
|
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||||
|
<style type="text/css">
|
||||||
|
.f-grid-row .f-grid-cell-inner {
|
||||||
|
white-space: normal;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
.LabelColor {
|
||||||
|
color: Red;
|
||||||
|
font-size: small;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<form id="form1" runat="server">
|
||||||
|
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" />
|
||||||
|
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
|
||||||
|
<Items>
|
||||||
|
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true"
|
||||||
|
TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server"
|
||||||
|
ActiveTabIndex="0">
|
||||||
|
<Tabs>
|
||||||
|
<f:Tab ID="Tab1" Title="各项目基本情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
|
||||||
|
<Items>
|
||||||
|
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
|
||||||
|
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
|
||||||
|
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
||||||
|
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||||
|
EnableTextSelection="True">
|
||||||
|
<Toolbars>
|
||||||
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||||
|
<Items>
|
||||||
|
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
|
||||||
|
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
|
||||||
|
</f:DropDownList>
|
||||||
|
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||||
|
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
|
||||||
|
</f:Button>
|
||||||
|
</Items>
|
||||||
|
</f:Toolbar>
|
||||||
|
</Toolbars>
|
||||||
|
<Columns>
|
||||||
|
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
|
||||||
|
TextAlign="Center">
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||||
|
</ItemTemplate>
|
||||||
|
</f:TemplateField>
|
||||||
|
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
|
||||||
|
HeaderTextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
|
||||||
|
HeaderTextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度" TextAlign="Right"
|
||||||
|
HeaderTextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
</Columns>
|
||||||
|
<PageItems>
|
||||||
|
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||||
|
</f:ToolbarSeparator>
|
||||||
|
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
|
||||||
|
</f:ToolbarText>
|
||||||
|
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
|
||||||
|
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
||||||
|
</f:DropDownList>
|
||||||
|
</PageItems>
|
||||||
|
</f:Grid>
|
||||||
|
</Items>
|
||||||
|
</f:Tab>
|
||||||
|
<f:Tab ID="Tab2" Title="月度计划统计" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
|
||||||
|
<Items>
|
||||||
|
</Items>
|
||||||
|
</f:Tab>
|
||||||
|
<f:Tab ID="Tab3" Title="周度计划统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
|
||||||
|
<Items>
|
||||||
|
</Items>
|
||||||
|
</f:Tab>
|
||||||
|
<f:Tab ID="TabOnlineMenuSet" Title="个人完成情况统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" Hidden="True">
|
||||||
|
<Items>
|
||||||
|
</Items>
|
||||||
|
</f:Tab>
|
||||||
|
</Tabs>
|
||||||
|
</f:TabStrip>
|
||||||
|
</Items>
|
||||||
|
</f:Panel>
|
||||||
|
</form>
|
||||||
|
<script type="text/javascript">
|
||||||
|
// 点击标题栏工具图标 - 退出
|
||||||
|
function closeNow(event) {
|
||||||
|
var bConfirmed = confirm('您确定要退出吗?');
|
||||||
|
if (bConfirmed) { closePage(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
function closePage() {
|
||||||
|
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
|
||||||
|
window.location.href = "about:blank";
|
||||||
|
window.close();
|
||||||
|
} else {
|
||||||
|
window.opener = null;
|
||||||
|
window.open("", "_self");
|
||||||
|
window.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
using BLL;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
|
using System.Data.SqlClient;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace FineUIPro.Web.DataShow
|
||||||
|
{
|
||||||
|
public partial class JD : PageBase
|
||||||
|
{
|
||||||
|
protected void Page_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (!IsPostBack)
|
||||||
|
{
|
||||||
|
Funs.DropDownPageSize(this.ddlPageSize);
|
||||||
|
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||||
|
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
|
||||||
|
BindGrid1();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BindGrid1()
|
||||||
|
{
|
||||||
|
string strSql = @"select ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum
|
||||||
|
from Base_Project p where ProjectState =1 ";
|
||||||
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
|
string cpara = string.Empty;
|
||||||
|
if (this.drpProject.SelectedValue != Const._Null)
|
||||||
|
{
|
||||||
|
strSql += " AND p.ProjectId = @projectId";
|
||||||
|
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
|
||||||
|
}
|
||||||
|
SqlParameter[] parameter = listStr.ToArray();
|
||||||
|
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||||
|
Grid1.RecordCount = tb.Rows.Count;
|
||||||
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
|
Grid1.DataSource = table;
|
||||||
|
Grid1.DataBind();
|
||||||
|
}
|
||||||
|
|
||||||
|
#region 查询
|
||||||
|
/// <summary>
|
||||||
|
/// 查询
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void TextBox_TextChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.BindGrid1();
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 表排序、分页、关闭窗口
|
||||||
|
/// <summary>
|
||||||
|
/// 分页
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||||
|
{
|
||||||
|
BindGrid1();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排序
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void Grid1_Sort(object sender, GridSortEventArgs e)
|
||||||
|
{
|
||||||
|
BindGrid1();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分页显示条数下拉框
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||||
|
BindGrid1();
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,159 @@
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// <自动生成>
|
||||||
|
// 此代码由工具生成。
|
||||||
|
//
|
||||||
|
// 对此文件的更改可能导致不正确的行为，如果
|
||||||
|
// 重新生成代码，则所做更改将丢失。
|
||||||
|
// </自动生成>
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
namespace FineUIPro.Web.DataShow {
|
||||||
|
|
||||||
|
|
||||||
|
public partial class JD {
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// form1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// PageManager1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.PageManager PageManager1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Panel2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Panel Panel2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TabStrip1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TabStrip TabStrip1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tab1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Tab Tab1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Grid1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Grid Grid1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Toolbar2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Toolbar Toolbar2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpProject 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpProject;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// btnClose 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Button btnClose;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// labNumber 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.WebControls.Label labNumber;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarSeparator1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarText1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ddlPageSize 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tab2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Tab Tab2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tab3 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Tab Tab3;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TabOnlineMenuSet 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Tab TabOnlineMenuSet;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -706,6 +706,7 @@
|
||||||
<Content Include="DataShow\HJGLWeldingItem.aspx" />
|
<Content Include="DataShow\HJGLWeldingItem.aspx" />
|
||||||
<Content Include="DataShow\InspectionManagement.aspx" />
|
<Content Include="DataShow\InspectionManagement.aspx" />
|
||||||
<Content Include="DataShow\InspectionManagementItem.aspx" />
|
<Content Include="DataShow\InspectionManagementItem.aspx" />
|
||||||
|
<Content Include="DataShow\JD.aspx" />
|
||||||
<Content Include="DataShow\LargeEngineering.aspx" />
|
<Content Include="DataShow\LargeEngineering.aspx" />
|
||||||
<Content Include="DataShow\LargeEngineeringItem.aspx" />
|
<Content Include="DataShow\LargeEngineeringItem.aspx" />
|
||||||
<Content Include="DataShow\License.aspx" />
|
<Content Include="DataShow\License.aspx" />
|
||||||
|
|
@ -9350,6 +9351,13 @@
|
||||||
<Compile Include="DataShow\InspectionManagementItem.aspx.designer.cs">
|
<Compile Include="DataShow\InspectionManagementItem.aspx.designer.cs">
|
||||||
<DependentUpon>InspectionManagementItem.aspx</DependentUpon>
|
<DependentUpon>InspectionManagementItem.aspx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="DataShow\JD.aspx.cs">
|
||||||
|
<DependentUpon>JD.aspx</DependentUpon>
|
||||||
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="DataShow\JD.aspx.designer.cs">
|
||||||
|
<DependentUpon>JD.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="DataShow\LargeEngineering.aspx.cs">
|
<Compile Include="DataShow\LargeEngineering.aspx.cs">
|
||||||
<DependentUpon>LargeEngineering.aspx</DependentUpon>
|
<DependentUpon>LargeEngineering.aspx</DependentUpon>
|
||||||
<SubType>ASPXCodeBehind</SubType>
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
|
|
||||||
|
|
@ -423,12 +423,10 @@ namespace FineUIPro.Web.ZHGL.RealName
|
||||||
{
|
{
|
||||||
var getIdentityCards = (from x in Funs.DB.SitePerson_Person
|
var getIdentityCards = (from x in Funs.DB.SitePerson_Person
|
||||||
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
|
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
|
||||||
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
|
join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
|
||||||
where x.ProjectId == projectId
|
where x.ProjectId == projectId && x.IsCardNoOK == true && pu.IsSynchro == true
|
||||||
&& x.IsCardNoOK==true
|
&& v.TeamId.HasValue && !x.RealNameAddTime.HasValue
|
||||||
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
|
&& x.HeadImage != null && x.HeadImage.Length > 0
|
||||||
&& !x.RealNameAddTime.HasValue
|
|
||||||
&& p.IsSynchro == true
|
|
||||||
select x.IdentityCard).Take(500);
|
select x.IdentityCard).Take(500);
|
||||||
foreach (var item in getIdentityCards)
|
foreach (var item in getIdentityCards)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
<div id="zlzg"></div>
|
<div id="zlzg"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="site jd">
|
<div class="site jd js-hover" data-type="JD">
|
||||||
<div class="label">
|
<div class="label">
|
||||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,progress%>"/>
|
<asp:Literal runat="server" Text="<%$ Resources:Lan,progress%>"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -529,6 +529,10 @@
|
||||||
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //关键事项数据
|
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //关键事项数据
|
||||||
window.open("../DataShow/GJSX.aspx")
|
window.open("../DataShow/GJSX.aspx")
|
||||||
|
|
||||||
|
}else if (type == 'JD') {
|
||||||
|
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //关键事项数据
|
||||||
|
window.open("../DataShow/JD.aspx")
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (type == 'ManagerData') {
|
else if (type == 'ManagerData') {
|
||||||
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
|
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue