This commit is contained in:
潘鸿锋 2024-04-08 10:29:00 +08:00
commit 41c5dad9f6
25 changed files with 122 additions and 238 deletions

View File

@ -26,6 +26,7 @@ namespace FineUIPro.Web.CLGL
this.btnGetAll.Hidden = false;
}
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.MCSWebService.GetCLData(null, null);
// 绑定表格
this.BindGrid();
}

View File

@ -33,9 +33,7 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -85,17 +85,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -33,9 +33,7 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -33,9 +33,7 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -39,9 +39,7 @@
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -93,15 +93,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -33,9 +33,7 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -31,9 +31,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
<f:Button ID="btnUrlN" Text="进入软件" ToolTip="进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>

View File

@ -35,17 +35,7 @@ namespace FineUIPro.Web.HJGL.FL
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
PageContext.RegisterStartupScript(String.Format("window.open('https://4dgd.cwcec.com/');"));
}
/// <summary>

View File

@ -66,15 +66,6 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>

View File

@ -52,7 +52,8 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="姓名" ID="txtUserName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px"></f:TextBox>
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="true" OnClick="btnNew_Click" runat="server"
Hidden="true">
@ -147,7 +148,9 @@
var src = $(this).attr('src');
console.log(src);
$('.imgPreview img').attr('src', src);
if (src.indexOf("/res/icon") != -1) {
return;
}
$('.imgPreview').show()
});
$('.imgPreview').on('click', function () {

View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1"/>
<compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

View File

@ -7,4 +7,7 @@
<TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
<TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
<TreeNode id="6549EF60-1DED-4912-8D2D-7B32A80A2DEC" Text="视频会议" NavigateUrl="Personal/PersonMeeting.aspx"></TreeNode>
<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
</Tree>

View File

@ -84,5 +84,7 @@
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
<TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
</TreeNode>
</Tree>

View File

@ -253,7 +253,7 @@
class="y_image_default">设备材料</span></div> -->
<div class="gj1"><span class="y_image_default y_tab-action" data-type="1">赢得值曲线</span><span
data-type="2">实物工程量</span></div>
<div class="gj"><span style="margin-right: .125rem;">关键事项完成率</span><span><%=gjsxRate %></span></div>
<div class="gj"><span style="margin-right: .125rem;">关键事项准点率</span><span><%=gjsxRate %></span></div>
</div>
<div class="y_box_main" id="jdmap" >
<div id='left_one' style="width: 100%; height: 100%;"></div>

View File

@ -1056,8 +1056,9 @@ namespace FineUIPro.Web.common
SqlParameter[] Staticparameter = listStaticListStr.ToArray();
DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
var allcount = Funs.GetNewIntOrZero(statcitbDataTable.Rows[0]["allcount"].ToString());
var closecount = Funs.GetNewIntOrZero(statcitbDataTable.Rows[0]["closecount"].ToString());
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x;
var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
var closecount = list.Count(x => x.State == "0");
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
gjsxRate = gjsxRate.ToString().Replace("NaN", "0") + "%";
}