From b51431f3eb0b159887aa1f1b5d77f94760bd9d4b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 17 Jun 2024 16:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 SGGL/FineUIPro.Web/Web.config                 |   4 +-
 SGGL/FineUIPro.Web/common/mainProject2.aspx   | 619 +++++++++---------
 .../FineUIPro.Web/common/mainProject2.aspx.cs | 103 +--
 .../common/mainProject2.aspx.designer.cs      | 234 +++++++
 5 files changed, 606 insertions(+), 355 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7b17fd9..90d55f55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-04
 /SGGLPackFile
 /SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-06
+/SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2024-06
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -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="/"/>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index b60972ae..d57e9cde 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -20,18 +20,22 @@
     <link rel="stylesheet" href="~/res/css/company.css">
 </head>
 <style>
-    html,body{
-        height:100%;
+    html, body {
+        height: 100%;
     }
+
     .BMap_mask {
         background-color: red;
     }
-    .table{
+
+    .table {
         margin-top: 0;
     }
-    .zyp{
+
+    .zyp {
         margin-top: 0;
     }
+
     body.f-body {
         padding: 0px;
     }
@@ -80,11 +84,11 @@
                             <div class="yj-bars">
                                 <div class="yj-bar">
                                     <div class="lab">资质预警</div>
-                                    <div class="num">6</div>
+                                    <div class="num"><%=getEarlyWarningCounts() %></div>
                                 </div>
                                 <div class="yj-bar">
                                     <div class="lab">机械预警</div>
-                                    <div class="num">6</div>
+                                    <div class="num"><%=GetJxyjNum() %></div>
                                 </div>
                             </div>
                             <div class="wd-box">
@@ -92,22 +96,22 @@
                                 <div class="inner">
                                     <div class="inner-box">
                                         <div class="lab">审批完成</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetCompletedNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
-                                        <div class="lab" style="    width: 1rem">培训人次数</div>
-                                        <div class="num">2</div>
+                                        <div class="lab" style="width: 1rem">培训人次数</div>
+                                        <div class="num"><%=GetTrainPersonNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
                                         <div class="lab">施工个数</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetConstructionNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
                                         <div class="lab">完工个数</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetFinishedNum() %></div>
                                     </div>
                                 </div>
                             </div>
@@ -116,22 +120,22 @@
                                 <div class="inner">
                                     <div class="inner-box">
                                         <div class="lab">审批完成</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetSuperCompletedNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
-                                        <div class="lab" style="    width: 1rem;">培训人次数</div>
-                                        <div class="num">2</div>
+                                        <div class="lab" style="width: 1rem;">培训人次数</div>
+                                        <div class="num"><%=GetSuperTrainPersonNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
                                         <div class="lab">施工个数</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetSuperConstructionNum() %></div>
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
                                         <div class="lab">完工个数</div>
-                                        <div class="num">2</div>
+                                        <div class="num"><%=GetSuperFinishedNum() %></div>
                                     </div>
                                 </div>
                             </div>
@@ -146,12 +150,12 @@
                     <div class="main">
                         <div class="total">
                             <div class="glry">
-                                <div class="lab">质量管理人员</div>
-                                <div class="num">1307</div>
+                                <div class="lab">质量培训累计人员</div>
+                                <div class="num" id="divCqmsPxNum" runat="server">1307</div>
                             </div>
                             <div class="glry">
-                                <div class="lab">质量培训累计人员</div>
-                                <div class="num">5217</div>
+                                <div class="lab">施工方案审批量</div>
+                                <div class="num" id="div_sgfaSpl" runat="server">5217</div>
                             </div>
                         </div>
                         <div class="zl-maps">
@@ -168,23 +172,24 @@
                     <div class="total">
                         <div class="zyp">
                             <div class="lab">动火</div>
-                            <div class="num">0/33</div>
+                            <div class="num"><%=getWrokCount0() %>/<%=getALLWrokCount0() %></div>
                         </div>
                         <div class="zyp">
-                            <div class="lab">高出</div>
-                            <div class="num">0/33</div>
+                            <div class="lab">高处</div>
+                            <div class="num"><%=getWrokCount1() %>/<%=getALLWrokCount1() %></div>
                         </div>
                         <div class="zyp">
                             <div class="lab">吊装</div>
-                            <div class="num">0/33</div>
+                            <div class="num"><%=getWrokCount2() %>/<%=getALLWrokCount2() %></div>
                         </div>
                         <div class="zyp">
                             <div class="lab">其他</div>
-                            <div class="num">0/33</div>
+                            <div class="num"><%=getWrokCount3() %>/<%=getALLWrokCount3() %></div>
                         </div>
                     </div>
                     <div class="zy-table">
-                        <div class="row" title="003-十一化建-合成氨区域-"><a
+                        <%=getLicenseManager() %>
+                        <%--<div class="row" title="003-十一化建-合成氨区域-"><a
                                 href="">003-十一化建-合成氨区域-非高风险-T0001设备吊装03-十一化建-合成氨区域-非高风险-T0001设备吊装03-十一化建-合成氨区域-非高风险-T0001设备吊装03-十一化建-合成氨区域-非高风险-T0001设备吊装</a>
                         </div>
                         <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>
@@ -193,63 +198,63 @@
                         <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>
                         <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>
                         <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>
-                        <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>
+                        <div class="row">003-十一化建-合成氨区域-非高风险-T0001设备吊装</div>--%>
                     </div>
                 </div>
             </div>
             <div class="c-side">
                 <div class="c-site">
                     <div class="num-box">
-                        <div class="num">1656059</div>
+                        <div class="num" id="divSafeWorkTime" runat="server">1656059</div>
                         <div class="lab">累计安全人工时</div>
                     </div>
                     <div class="num-box">
-                        <div class="num">0</div>
+                        <div class="num" id="divSafeWorkTimeMonth" runat="server">0</div>
                         <div class="lab">本月安全人工时</div>
                     </div>
                     <div class="num-box">
-                        <div class="num">1161</div>
+                        <div class="num" id="divSafePersonNum" runat="server">1161</div>
                         <div class="lab">安全培训累计人员</div>
                     </div>
                     <div class="num-box">
-                        <div class="num">3</div>
+                        <div class="num" id="divSafeManagePersonNum" runat="server">3</div>
                         <div class="lab">安全管理人员</div>
                     </div>
                     <div class="num-box">
-                        <div class="num">4564</div>
+                        <div class="num" runat="server" id="divWS">4564</div>
                         <div class="lab">未遂事件</div>
                     </div>
                 </div>
                 <div class="aqyh">
                     <div class="an-boxs">
-                        <div>安全隐患</div>
+                        <div>整改数据</div>
                         <div>
                             <div class="dot">
                                 <div class="dot-c" style="background: #4F97F9;"></div>
                             </div>
                             <p>总数</p>
-                            <p style="color: #4F97F9;">265</p>
+                            <p style="color: #4F97F9;" runat="server" id="div_zgsj">265</p>
                         </div>
                         <div>
                             <div class="dot">
                                 <div class="dot-c" style="background: #12CDA2;"></div>
                             </div>
                             <p>已完成</p>
-                            <p style="color: #12CDA2;">265</p>
+                            <p style="color: #12CDA2;" runat="server" id="div_zgywc">265</p>
                         </div>
                         <div>
                             <div class="dot">
                                 <div class="dot-c" style="background: #FF7474;"></div>
                             </div>
-                            <p>已完成</p>
-                            <p style="color: #FF7474;">12</p>
+                            <p>未完成</p>
+                            <p style="color: #FF7474;" runat="server" id="div_zgwwc">12</p>
                         </div>
                         <div>
                             <div class="dot">
                                 <div class="dot-c" style="background: #FFD130;"></div>
                             </div>
                             <p>整改率</p>
-                            <p style="color: #FFD130;">100%</p>
+                            <p style="color: #FFD130;" runat="server" id="div_zgwcl">100%</p>
                         </div>
                     </div>
                 </div>
@@ -257,10 +262,11 @@
 
                     <div class="swiper">
                         <div class="swiper-wrapper">
-                            <div class="swiper-slide">
+                            <%=divProjectImg %>
+                            <%--<div class="swiper-slide">
                                 <img src="../res/images/16.png">
                                 
-                                <%--<div class="detail-box">
+                                <div class="detail-box">
                                     <div class="title">应城宏宜年产40万吨合成氨项目</div>
                                     <div class="det-row">
                                         <div class="col">
@@ -277,31 +283,31 @@
                                         </div>
                                     </div>
                                     <p><span>工程概况：</span><span>应城宏宜年产40万吨合成氨项目应城宏宜年产40万吨合成氨项目应城宏宜年产40万吨合成氨项目应城宏宜年产40万吨合成氨项目应城宏宜年产40万吨合成氨项目应城宏宜年产40万吨合成氨项目...</span></p>
-                                </div>--%>
-                            </div>
+                                </div>
+                            </div>--%>
                         </div>
                     </div>
 
                     <div class="ht-boxs">
                         <div class="ht-box">
                             <div class="label">合同工期</div>
-                            <div class="value">700<span>天</span></div>
+                            <div class="value" id="divProjectDays" runat="server">0<span>天</span></div>
                         </div>
                         <div class="ht-box">
                             <div class="label">合同到期时间</div>
-                            <div class="value">2024-07-14</div>
+                            <div class="value" id="divEndDate" runat="server"></div>
                         </div>
                         <div class="ht-box">
                             <div class="label">合同剩余</div>
-                            <div class="value">100<span>天</span></div>
+                            <div class="value" id="divRemainingDays" runat="server">0<span>天</span></div>
                         </div>
                     </div>
                 </div>
 
                 <div class="site aqtj">
-                    <div class="gjl">关键事项准点率 <span>90%</span></div>
+                    <div class="gjl">关键事项准点率 <span><%=gjsxRate %></span></div>
                     <div class="label">
-                        安全统计
+                        进度统计
                     </div>
                     <div class="main">
                         <div id="aq-map"></div>
@@ -315,24 +321,29 @@
                     </div>
                     <div class="main">
                         <div class="total">
-                            <div class="zg">
+                            <div class="zg" style="cursor: pointer;" runat="server" onclick="showGztm(0)" id="div_Gzgjsx">
                                 <div class="lab">关键事项</div>
-                                <div class="num">719</div>
+                                <div class="num" id="div_gjsx" runat="server">0</div>
                             </div>
-                            <div class="zg">
+                            <div class="zg" style="cursor: pointer" runat="server" onclick="showGztm(1)" id="div_Gzdbsx">
                                 <div class="lab">待办事项</div>
-                                <div class="num">681</div>
+                                <div class="num" id="div_dbsx" runat="server">0</div>
                             </div>
-                            <div class="zg">
+                            <div class="zg" style="cursor: pointer" runat="server" onclick="showGztm(2)" id="div_Gzgrlc">
                                 <div class="lab">个人流程</div>
-                                <div class="num">120</div>
+                                <div class="num" id="div_grlc" runat="server">0</div>
                             </div>
                             <div class="zg">
                                 <div class="lab">已办任务</div>
-                                <div class="num">120</div>
+                                <div class="num" id="div_ybrw" runat="server">0</div>
                             </div>
                         </div>
-                        <ul>
+                        <div class="zyp-lis" id="div_gjsxlist" runat="server" style="display: none">
+                        </div>
+
+                        <div class="zyp-lis" id="div_dbsxlist" runat="server">
+                        </div>
+                        <%--<ul>
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装003-十一化建-合成氨区域-非高风险-T0001设备吊装003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
@@ -341,7 +352,7 @@
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
                             <li>003-十一化建-合成氨区域-非高风险-T0001设备吊装</li>
-                        </ul>
+                        </ul>--%>
                     </div>
                 </div>
                 <div class="site p-ry" style="height: 3.75rem;">
@@ -351,15 +362,15 @@
                     <div class="total">
                         <div class="rs">
                             <div class="lab">当前现场人数</div>
-                            <div class="num">1307</div>
+                            <div class="num" id="div_xcrs" runat="server">0</div>
                         </div>
                         <div class="rs">
                             <div class="lab">作业人员总数</div>
-                            <div class="num">5217</div>
+                            <div class="num" runat="server" id="div_zyxcrs">0</div>
                         </div>
                         <div class="rs">
                             <div class="lab">管理人员总数</div>
-                            <div class="num">5217</div>
+                            <div class="num" runat="server" id="div_glxcrs">0</div>
                         </div>
                     </div>
                     <div id="ry-map" style="height: 2.3125rem;"></div>
@@ -370,89 +381,159 @@
                     </div>
                     <div class="main" style="padding: .1875rem .25rem;">
                         <div class="cl-tab">
-                            <div class="cl-btn cl-btn-act">管道材料</div>
-                            <div class="cl-btn">设备材料</div>
+                            <div class="cl-btn cl-btn-act" id="span_gdcl" onclick="clOnclick(0)" style="cursor:pointer">管道材料</div>
+                            <div class="cl-btn" onclick="clOnclick(1)" id="span_sbcl" style="cursor:pointer">设备材料</div>
                         </div>
                         <div class="table">
-                            <div class="row">
+                            <div class="row" id="div_cldhHead">
                                 <div class="th-p">材料类别</div>
                                 <div class="th-p">设计量</div>
-                                <div class="th-p"><p>采购量</p><p><span>采购量</span><span>百分比</span></p></div>
-                                <div class="th-p"><p>到货量</p><p><span>已到货</span><span>百分比</span></p></div>
-                                <div class="th-p"><p>出库量</p><p><span>已出库</span><span>百分比</span></p></div>
+                                <div class="th-p">
+                                    <p>采购量</p>
+                                    <p><span>采购量</span><span>百分比</span></p>
+                                </div>
+                                <div class="th-p">
+                                    <p>到货量</p>
+                                    <p><span>已到货</span><span>百分比</span></p>
+                                </div>
+                                <div class="th-p">
+                                    <p>领料量</p>
+                                    <p><span>已领料</span><span>百分比</span></p>
+                                </div>
                             </div>
-                            <div class="t-body">
-                                <div class="row">
+                            <div class="t-body" id="div_cldhList">
+                                 <%=gdclHtml %>
+                                <%--<div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
-                               
+
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span title="154154.1">154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span title="154154.1">154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="tr">材料类别</div>
                                     <div class="tr">154154.1</div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                    <div class="tr"><p><span>154154.1</span><span>105.2%</span></p></div>
-                                </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                    <div class="tr">
+                                        <p><span>154154.1</span><span>105.2%</span></p>
+                                    </div>
+                                </div>--%>
                             </div>
                         </div>
                     </div>
@@ -480,13 +561,13 @@
 
     function clOnclick(objval) {
         if (objval == 0) {
-            $("#span_gdcl").addClass("y_tab-action")
-            $("#span_sbcl").removeClass("y_tab-action")
+            $("#span_gdcl").addClass("cl-btn-act")
+            $("#span_sbcl").removeClass("cl-btn-act")
             $("#div_cldhHead").html('<%=gdclHead%>')
             $("#div_cldhList").html('<%=gdclHtml%>')
         } else {
-            $("#span_sbcl").addClass("y_tab-action")
-            $("#span_gdcl").removeClass("y_tab-action")
+            $("#span_sbcl").addClass("cl-btn-act")
+            $("#span_gdcl").removeClass("cl-btn-act")
             $("#div_cldhHead").html('<%=sbclHead%>')
             $("#div_cldhList").html('<%=sbclHtml%>')
         }
@@ -543,7 +624,7 @@
             $("#jdmap1").hide()
             $("#jdmap").show()
         } else if (type == 2) {
-            // 实物工程量
+            // 累计BCWS
             $("#jdmap").hide()
             $("#jdmap1").show()
         }
@@ -818,7 +899,7 @@
             legend: {
                 top: fontSize(10),
                 left: fontSize(20),
-                data: [{ name: '实物工程量', textStyle: { color: '#63CAFF' } }, { name: '进度曲线', textStyle: { color: '#12CDA2' } }, { name: '主进度线', textStyle: { color: '#C293FF' } }]
+                data: [{ name: '累计BCWS', textStyle: { color: '#63CAFF' } }, { name: '累计BCWP', textStyle: { color: '#12CDA2' } }, { name: '累计ACWP', textStyle: { color: '#C293FF' } }]
             },
             xAxis: {
                 type: 'category',
@@ -852,7 +933,7 @@
             },
             series: [
                 {
-                    name: '实物工程量',
+                    name: '累计BCWS',
                     data: value,
                     type: 'bar',
                     barWidth: fontSize(20),
@@ -876,7 +957,7 @@
                     },
                 },
                 {
-                    name: '进度曲线',
+                    name: '累计BCWP',
                     data: value1,
                     type: 'line',
                     barWidth: fontSize(20),
@@ -900,7 +981,7 @@
 
                 },
                 {
-                    name: '主进度线',
+                    name: '累计ACWP',
                     data: value2,
                     type: 'line',
                     itemStyle: {
@@ -1441,15 +1522,21 @@
     // 人员信息
     createRYXX()
     function createRYXX() {
-        let type = ['类别11111111', '类别211111111', '类别3', '类别4', '类别5', '类别6', '类别7', '类别8', '类别9', '类别10']
+        var person =<%=Person %>
+            //let type = ['类别11111111', '类别211111111', '类别3', '类别4', '类别5', '类别6', '类别7', '类别8', '类别9', '类别10']
+            let type = person.categories
         // 计划月进度
-        let value = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
+        //let value = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
+        let value = two.series[0].data
 
         let opt = {
             grid: {
                 top: 10,
                 bottom: 40,
 
+            },
+                  tooltip: {
+                formatter: '{b}: {c}'
             },
             xAxis: {
                 type: 'category',
@@ -1461,9 +1548,12 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -16, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -20, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
+                    textStyle: {
+                        fontSize: 10
+                    }
                 },
                 axisTick: {
                     show: false
@@ -1484,53 +1574,13 @@
                     }
                 }
             },
-            dataZoom: [
-                {
-                    // 设置滚动条的隐藏或显示
-                    show: value.length > 10,
-                    // 设置类型
-                    type: "slider",
-                    // 设置背景颜色
-                    backgroundColor: "rgb(19, 63, 100)",
-                    // 设置选中范围的填充颜色
-                    fillerColor: "rgb(16, 171, 198)",
-                    // 设置边框颜色
-                    borderColor: "rgb(19, 63, 100)",
-                    // 是否显示detail，即拖拽时候显示详细数值信息
-                    showDetail: false,
-                    // 数据窗口范围的起始数值
-                    startValue: 0,
-                    // 数据窗口范围的结束数值（一页显示多少条数据）
-                    endValue: 9,
-                    // 控制哪个轴，如果是number表示控制一个轴，
-                    // 如果是Array表示控制多个轴。此处控制第二根轴
-                    xAxisIndex: 0,
-                    // empty：当前数据窗口外的数据，被设置为空。
-                    // 即不会影响其他轴的数据范围
-                    filterMode: "empty",
-                    // 滚动条高度
-                    // width: "90%",
-                    // 滚动条显示位置
-                    height: 8,
-                    // 距离右边
-                    right: 20,
-                    left: 20,
-                    // 控制手柄的尺寸
-                    handleSize: 0,
-                    // 是否锁定选择区域（或叫做数据窗口）的大小
-                    zoomLoxk: true,
-                    // 组件离容器上侧的距离
-                    // 如果top的值为'top', 'middle', 'bottom'，组件会根据相应的位置自动对齐
-                    bottom: 0,
-                },
-
-            ],
+            
             series: [
                 {
                     name: '',
                     data: value,
                     type: 'bar',
-                    barWidth: 14,
+                    barWidth: 10,
                     itemStyle: {
                         color: '#3780FF'
                     }
@@ -1546,36 +1596,66 @@
     // 安全统计
     createAQTJ()
     function createAQTJ() {
-        let type = ['类别11111111', '类别211111111', '类别3', '类别4', '类别5', '类别6', '类别7', '类别8', '类别9', '类别10']
-        // 实物工程量
-        let value = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
-        // 进度曲线
-        let value1 = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
-        // 主进度线
-        let value2 = [132, 99, 121, 35, 86, 154, 18, 76, 123, 232]
+        var two =<%=Two %>;
+        //let type = ['类别11111111', '类别211111111', '类别3', '类别4', '类别5', '类别6', '类别7', '类别8', '类别9', '类别10']
+        let type = two.categories
+        // 累计BCWS
+        //let value = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
+        let value = two.series[1].data
+        // 累计BCWP
+        //let value1 = [120, 80, 150, 80, 70, 110, 130, 70, 110, 130]
+        let value1 = two.series[3].data
+        // 累计ACWP
+        //let value2 = [132, 99, 121, 35, 86, 154, 18, 76, 123, 232]
+        let value2 = two.series[5].data
+
+        let m_bcws = two.series[0].data
+        let m_acwp = two.series[4].data
+        let m_bcwp = two.series[2].data
         let opt = {
             grid: {
                 top: 60,
                 bottom: 40,
 
             },
+            tooltip: {
+                formatter: '{a}<br />{b}: {c}'
+            },
             legend: {
                 top: 10,
                 data: [
                     {
-                        name: "实物工程量",
+                        name: "本月BCWS",
                         textStyle: {
                             color: '#63CAFF'
                         }
                     },
                     {
-                        name: "进度曲线",
+                        name: "本月BCWP",
                         textStyle: {
                             color: '#12CDA2'
                         }
                     },
                     {
-                        name: "主进度线",
+                        name: "本月ACWP",
+                        textStyle: {
+                            color: '#C293FF'
+                        }
+                    },
+                    {
+                        name: "累计BCWS",
+                        textStyle: {
+                            color: '#63CAFF'
+                        }
+                    },
+                    {
+                        name: "累计BCWP",
+                        textStyle: {
+                            color: '#12CDA2'
+                        }
+                    },
+                    {
+                        name: "累计ACWP",
                         textStyle: {
                             color: '#C293FF'
                         }
@@ -1591,9 +1671,9 @@
                     }
                 },
                 axisLabel: {
-                    interval: 0,
-                    rotate: -16, // 如果数据较多时旋转标签以避免重叠
-                    margin: 8, // 设置标签与轴线之间的距离
+                    //nterval: 0,
+                    //tate: -16, // 如果数据较多时旋转标签以避免重叠
+                    //rgin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },
                 axisTick: {
@@ -1615,155 +1695,74 @@
                     }
                 }
             },
-            dataZoom: [
-                {
-                    // 设置滚动条的隐藏或显示
-                    show: value.length > 10,
-                    // 设置类型
-                    type: "slider",
-                    // 设置背景颜色
-                    backgroundColor: "rgb(19, 63, 100)",
-                    // 设置选中范围的填充颜色
-                    fillerColor: "rgb(16, 171, 198)",
-                    // 设置边框颜色
-                    borderColor: "rgb(19, 63, 100)",
-                    // 是否显示detail，即拖拽时候显示详细数值信息
-                    showDetail: false,
-                    // 数据窗口范围的起始数值
-                    startValue: 0,
-                    // 数据窗口范围的结束数值（一页显示多少条数据）
-                    endValue: 9,
-                    // 控制哪个轴，如果是number表示控制一个轴，
-                    // 如果是Array表示控制多个轴。此处控制第二根轴
-                    xAxisIndex: 0,
-                    // empty：当前数据窗口外的数据，被设置为空。
-                    // 即不会影响其他轴的数据范围
-                    filterMode: "empty",
-                    // 滚动条高度
-                    // width: "90%",
-                    // 滚动条显示位置
-                    height: 8,
-                    // 距离右边
-                    right: 20,
-                    left: 20,
-                    // 控制手柄的尺寸
-                    handleSize: 0,
-                    // 是否锁定选择区域（或叫做数据窗口）的大小
-                    zoomLoxk: true,
-                    // 组件离容器上侧的距离
-                    // 如果top的值为'top', 'middle', 'bottom'，组件会根据相应的位置自动对齐
-                    bottom: 0,
-                },
 
-            ],
             series: [
                 {
-                    name: '实物工程量',
-                    data: value,
+                    name: '本月BCWS',
+                    data: m_bcws,
                     type: 'bar',
-                    barWidth: 20,
                     itemStyle: {
                         color: '#63CAFF'
                     },
                     label: {
-                        show: true,
+                        show: false,
                         rotate: 90,
                         color: '#ffffff'
                     }
                 },
                 {
-                    name: '进度曲线',
-                    data: value1,
-                    type: 'line',
-                    symbol: 'none',
-                    itemStyle: {
-                        color: '#EDB627'
-                    },
-                    areaStyle: {
-                        normal: {
-                            color: new echarts.graphic.LinearGradient(
-                                0,
-                                0,
-                                0,
-                                1,
-                                [
-                                    {
-                                        offset: 0,
-                                        color: 'rgba(237, 182, 39, 1)' // 折线底下区域渐变色
-                                    },
-                                    {
-                                        offset: 0.8,
-                                        color: 'rgba(237, 182, 39, 0)' // 折线底下区域渐变色
-                                    }
-                                ],
-                                false
-                            )
-                        }
-
-                    }
-                },
-                {
-                    name: '进度曲线',
-                    data: value1,
-                    type: 'line',
-                    symbol: 'none',
-                    itemStyle: {
-                        color: '#12CDA2'
-                    },
-                    areaStyle: {
-                        normal: {
-                            color: new echarts.graphic.LinearGradient(
-                                0,
-                                0,
-                                0,
-                                1,
-                                [
-                                    {
-                                        offset: 0,
-                                        color: 'rgba(18, 205, 162, 1)' // 折线底下区域渐变色
-                                    },
-                                    {
-                                        offset: 0.8,
-                                        color: 'rgba(18, 205, 162, 0)' // 折线底下区域渐变色
-                                    }
-                                ],
-                                false
-                            )
-                        }
-
-                    }
-                },
-                {
-                    name: '主进度线',
-                    data: value2,
-                    type: 'line',
-                    symbol: 'none',
+                    name: '本月ACWP',
+                    data: m_acwp,
+                    type: 'bar',
                     itemStyle: {
                         color: '#C293FF'
                     },
-                    areaStyle: {
-                        normal: {
-                            color: new echarts.graphic.LinearGradient(
-                                0,
-                                0,
-                                0,
-                                1,
-                                [
-                                    {
-                                        offset: 0,
-                                        color: 'rgba(194, 147, 255, 1)' // 折线底下区域渐变色
-                                    },
-                                    {
-                                        offset: 0.8,
-                                        color: 'rgba(194, 147, 255, 0)' // 折线底下区域渐变色
-                                    }
-                                ],
-                                false
-                            )
-                        }
-
+                    label: {
+                        show: false,
+                        rotate: 90,
+                        color: '#ffffff'
                     }
                 },
+                {
+                    name: '本月BCWP',
+                    data: m_bcwp,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#12CDA2'
+                    },
+                    label: {
+                        show: false,
+                        rotate: 90,
+                        color: '#ffffff'
+                    }
+                },
+                {
+                    name: '累计BCWS',
+                    data: value,
+                    type: 'line',
+                    //symbol: 'none',
+                    itemStyle: {
+                        color: '#63CAFF'
+                    },
+                },
+                {
+                    name: '累计BCWP',
+                    data: value1,
+                    type: 'line',
+                    //symbol: 'none',
+                    itemStyle: {
+                        color: '#12CDA2'
+                    },
+                },
+                {
+                    name: '累计ACWP',
+                    data: value2,
+                    type: 'line',
+                    //symbol: 'none',
+                    itemStyle: {
+                        color: '#C293FF'
+                    },
+                },
             ]
         };
         var myEchart = echarts.init(document.getElementById('aq-map'));
@@ -1772,9 +1771,9 @@
 
     // 质量概况
     let weekData = [
-        { name: '质量问题整改率', value1: 90, value2: 10, el: 'zl-map1' },
-        { name: '一次共检合格率', value1: 88, value2: 12, el: 'zl-map2' },
-        { name: '焊接一次合格率', value1: 91, value2: 9, el: 'zl-map3' },
+        { name: '质量问题整改率', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' },
+        { name: '一次共检合格率', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' },
+        { name: '焊接一次合格率', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' },
     ]
     weekData.forEach(e => {
         createZL(e)
@@ -1846,7 +1845,13 @@
                     detail: {
                         valueAnimation: true,
                         formatter: function (value) {
-                            str = `{a|${(obj.value2 / obj.value1 * 100).toFixed(2)}}{b|%}`
+                            if (obj.value1 == 0) {
+                                str = `{a|0}{b|%}`
+                            } else {
+                                str = `{a|${(obj.value2 / obj.value1 * 100).toFixed(2)}}{b|%}`
+                            }
+
+
                             return str;
                         },
                         color: 'inherit',
@@ -1941,13 +1946,13 @@
     function createFXMap() {
 
         const list = [
-            { TypeName: "重大风险", ValueAmount: 1 },
-            { TypeName: "低风险", ValueAmount: 3 },
-            { TypeName: "一般风险", ValueAmount: 2 },
-            { TypeName: "较大风险", ValueAmount: 6 },
+            { TypeName: "重大风险", ValueAmount: <%=riskData4%> },
+            { TypeName: "低风险", ValueAmount: <%=riskData1%> },
+            { TypeName: "一般风险", ValueAmount: <%=riskData3%> },
+            { TypeName: "较大风险", ValueAmount: <%=riskData2%> },
         ]
         // 数据类型
-        let value = 26.5
+        let value = <%=riskDataRate%>;
 
         const color = ['#673646', '#1A3B73', '#5E672F', '#674B1B']
         const color1 = ['#FF7474', '#1FC6FF', '#E9E931', '#FFA602']
@@ -1981,7 +1986,7 @@
                     }
                 }
             }, {
-                text: '数据类型',
+                text: '重大风险',
                 top: 110,
                 left: 'center',
                 textStyle: {
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index b56c3aa3..e4945919 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.common
                 int wHours = 0;
                 DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
                 wHours = (from x in db.T_d_EmployInOutRecord where x.ProjectId == ProjectId select x.ManHours ?? 0).ToList().Sum();
-                //this.divSafeWorkTime.InnerHtml = wHours.ToString();
+                this.divSafeWorkTime.InnerHtml = wHours.ToString();
 
                 //本月安全人工时
                 int wHoursMonth = 0;
@@ -59,14 +59,14 @@ namespace FineUIPro.Web.common
                 {
                     wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
                 }
-                //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
+                this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
 
                 //安全培训累计人员
                 var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Sum(x => x.TrainPersonNum) ?? 0;
                 //修改：增加博晟教育中的人数
                 var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => x.ProjectId == ProjectId && (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
 
-                //this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
 
                 //安全管理人员
                 var allSum = from x in Funs.DB.SitePerson_Person
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.common
                                   join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                                   where y.IsHsse == true && x.ProjectId == ProjectId     //安管人员
                                   select x;
-                //this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
+                this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
 
                 //未遂事故
                 var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
@@ -88,7 +88,7 @@ namespace FineUIPro.Web.common
                                       join y in db.Sys_Const on x.AccidentTypeId equals y.ConstValue
                                       where y.ConstText.Contains("未遂") && x.ProjectId == ProjectId
                                       select x;
-                //this.divWS.InnerHtml = (wsAccidentList1.Count() + wsAccidentList2.Count()).ToString();
+                this.divWS.InnerHtml = (wsAccidentList1.Count() + wsAccidentList2.Count()).ToString();
 
                 //整改数据
                 getZgsj();
@@ -104,12 +104,12 @@ namespace FineUIPro.Web.common
                 int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
                                  where x.IsTrain == true && x.ProjectId == ProjectId
                                  select x).Count();
-                //divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
+                divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
 
                 //施工审批量
                 int sgspl = Funs.DB.Comprehensive_GeneralPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count()
                     + Funs.DB.Comprehensive_MajorPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count();
-                //div_sgfaSpl.InnerHtml = sgspl.ToString();
+                div_sgfaSpl.InnerHtml = sgspl.ToString();
                 GetJD();
                 //质量共检
                 getZlgj();
@@ -150,11 +150,11 @@ namespace FineUIPro.Web.common
             if (AllCount > 0)
             {
                 ////当前现场总人数
-                //div_xcrs.InnerHtml = AllCount.ToString();
+                div_xcrs.InnerHtml = AllCount.ToString();
                 //作业人数
-                //div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
+                div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
                 //管理人数
-                //div_glxcrs.InnerHtml = MCount.ToString();
+                div_glxcrs.InnerHtml = MCount.ToString();
             }
         }
         #endregion
@@ -182,10 +182,10 @@ namespace FineUIPro.Web.common
         #region 整改数据
         protected void getZgsj()
         {
-            //div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
-            //div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
-            //div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
-            //div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).Replace("NaN", "0") + "%";
+            div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
+            div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
+            div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
+            div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).Replace("NaN", "0") + "%";
         }
 
         /// <summary>
@@ -238,7 +238,7 @@ namespace FineUIPro.Web.common
             divOwnUnitTitle = "";
             divSGUnitTitle = "";
             divJLUnitTitle = "";
-            divProjectImg = "<div class=\"swiper-slide\"><img src=\"./imags/16.png\"></div>";
+            divProjectImg = "<div class=\"swiper-slide\"><img src=\"../res/images/16.png\"></div>";
             var project = ProjectService.GetProjectByProjectId(this.ProjectId);
             if (project != null)
             {
@@ -288,18 +288,18 @@ namespace FineUIPro.Web.common
                 //this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString() + "万元";
                 if (project.EndDate.HasValue)
                 {
-                    //this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
+                    this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
                     int endDays = (project.EndDate.Value - DateTime.Now).Days;
                     if (endDays >= 0)
                     {
-                        //this.divRemainingDays.InnerHtml = endDays.ToString() + "<span>天</span>";
+                        this.divRemainingDays.InnerHtml = endDays.ToString() + "<span>天</span>";
                     }
                     if (project.StartDate.HasValue)
                     {
                         int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
                         if (pdays >= 0)
                         {
-                            //this.divProjectDays.InnerHtml = pdays.ToString() + "<span>天</span>";
+                            this.divProjectDays.InnerHtml = pdays.ToString() + "<span>天</span>";
                         }
                     }
                 }
@@ -332,7 +332,7 @@ namespace FineUIPro.Web.common
                         }
                     }
 
-                    divProjectImg = divProjectImg.Replace("<div class=\"swiper-slide\"><img src=\"./imags/16.png\"></div>", "");
+                    divProjectImg = divProjectImg.Replace("<div class=\"swiper-slide\"><img src=\"../res/images/16.png\"></div>", "");
                     /*string firtstUrl = Funs.GetStrListByStr(url, ',').FirstOrDefault();
                     if (!string.IsNullOrEmpty(firtstUrl))
                     {
@@ -364,6 +364,7 @@ namespace FineUIPro.Web.common
         protected string riskData2;
         protected string riskData3;
         protected string riskData4;
+        protected string riskDataRate;
         /// <summary>
         /// 获取风险管控
         /// </summary>
@@ -382,6 +383,14 @@ namespace FineUIPro.Web.common
             riskData2 = getHazards.Count(x => x.RiskLevel == 2).ToString();
             riskData3 = getHazards.Count(x => x.RiskLevel == 3).ToString();
             riskData4 = getHazards.Count(x => x.RiskLevel == 4).ToString();
+            if (getHazards.Count() > 0)
+            {
+                riskDataRate = (100.0 * getHazards.Count(x => x.RiskLevel == 4) / getHazards.Count()).ToString("0.##");
+            }
+            else
+            {
+                riskDataRate = "0";
+            }
 
         }
 
@@ -946,7 +955,12 @@ namespace FineUIPro.Web.common
                 {
                     gfx = "非高风险";
                 }
-                var shortUnitname = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault().ShortUnitName;
+                string shortUnitname = string.Empty;
+                var unit = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault();
+                if (unit != null)
+                {
+                    shortUnitname = unit.ShortUnitName;
+                }
                 returnHtml += "<div class=\"li\">" + item.LicenseManagerCode + "-" + shortUnitname + "-" + item.WorkAreaName + "-" + gfx + "-" + item.LicenseTypeName
                     + "</div>";
             }
@@ -987,12 +1001,12 @@ namespace FineUIPro.Web.common
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
                 var Gjsxcount = tb.Rows.Count;
-                //div_gjsx.InnerHtml = Gjsxcount.ToString();
+                div_gjsx.InnerHtml = Gjsxcount.ToString();
 
                 var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
                 //待办事项、个人流程
-                //div_dbsx.InnerHtml = getDataList.Count().ToString();
-                //div_grlc.InnerHtml = getDataList.Count().ToString();
+                div_dbsx.InnerHtml = getDataList.Count().ToString();
+                div_grlc.InnerHtml = getDataList.Count().ToString();
                 foreach (var item in getDataList)
                 {
                     returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\"  onclick=\"returnWindows('" + item.PCUrl + "')\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
@@ -1003,7 +1017,7 @@ namespace FineUIPro.Web.common
             {
                 returnDbHtml = "<div></div>";
             }
-            //this.div_dbsxlist.InnerHtml = returnDbHtml;
+            this.div_dbsxlist.InnerHtml = returnDbHtml;
 
 
         }
@@ -1051,7 +1065,7 @@ namespace FineUIPro.Web.common
             {
                 returnDbHtml = "<div></div>";
             }
-            //this.div_gjsxlist.InnerHtml = returnDbHtml;
+            this.div_gjsxlist.InnerHtml = returnDbHtml;
 
             List<SqlParameter> listStaticListStr = new List<SqlParameter>();
 
@@ -1099,12 +1113,12 @@ namespace FineUIPro.Web.common
         protected string gdclHtml;
         protected string sbclHtml;
 
-        protected string gdclHead = "<div class=\"trth\" style=\"background: rgba(33, 55, 113, .4);\"><div class=\"th r-line\" style=\"width: .7875rem;\"><p>材料类别</p></div><div class=\"th r-line\" style=\"width: .8375rem;\"><p>设计量</p></div><div class=\"th r-line\" style=\"width: 1.575rem;\"><p class=\"b-line\">采购量</p><p><span class=\"r-line\">采购量</span><span class=\"r-line\">百分比</span></p></div><div class=\"th r-line\" style=\"width: 1.575rem;\"><p class=\"b-line\">到货量</p><p><span class=\"r-line\">已到货</span><span class=\"r-line\">百分比</span></p></div><div class=\"th\" style=\"width: 1.575rem;\"><p class=\"b-line\">领料量</p><p><span class=\"r-line\">已领料</span><span>百分比</span></p></div></div>";
-        protected string sbclHead = "<div class=\"trth\" style=\"background: rgba(33, 55, 113, .4);\"><div class=\"th r-line\" style=\"width: 2.9875rem;\"><p>合同号</p></div>" +
-            "<div class=\"th r-line\" style=\"width:  .7875rem;\"><p>采购总量</p></div>" +
-            "<div class=\"th r-line\" style=\"width: .7875rem;\"><p>发货总量</p></div>" +
-            "<div class=\"th r-line\" style=\"width: .7875rem;\"><p>到货总量</p></div>" +
-            "<div class=\"th r-line\" style=\"width: .9875rem;\"><p>到货百分比</p></div>";
+        protected string gdclHead = "<div class=\"th-p\">材料类别</div><div class=\"th-p\">设计量</div><div class=\"th-p\"><p>采购量</p><p><span>采购量</span><span>百分比</span></p></div><div class=\"th-p\"><p>到货量</p><p><span>已到货</span><span>百分比</span></p></div><div class=\"th-p\"><p>领料量</p><p><span>已领料</span><span>百分比</span></p></div>";
+        protected string sbclHead = "<div class=\"th-p\">合同号</div>" +
+            "<div class=\"th-p\" >采购总量</div>" +
+            "<div class=\"th-p\" >发货总量</div>" +
+            "<div class=\"th-p\" >到货总量</div>" +
+            "<div class=\"th-p\" >到货百分比</div>";
         private void getCldh()
         {
             //管道材料
@@ -1112,15 +1126,12 @@ namespace FineUIPro.Web.common
             var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId == pid);
             foreach (var item in list)
             {
-                gdclHtml += "<div class=\"tr\">";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + item.C1 + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .8375rem; \">" + (string.IsNullOrEmpty(item.C2) ? "0" : item.C2) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C6) ? "0" : item.C6) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C7) ? "0%" : item.C7) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C8) ? "0" : item.C8) + "</span>";
-                gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + "</span>";
+                gdclHtml += "<div class=\"row\">";
+                gdclHtml += "<div class=\"tr\" >" + item.C1 + "</div>";
+                gdclHtml += "<div class=\"tr\" >" + (string.IsNullOrEmpty(item.C2) ? "0" : item.C2) + "</div>";
+                gdclHtml += "<div class=\"tr\" ><p><span>" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + "</span><span>" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + "</span></p></div>";
+                gdclHtml += "<div class=\"tr\" ><p><span>" + (string.IsNullOrEmpty(item.C6) ? "0" : item.C6) + "</span><span>" + (string.IsNullOrEmpty(item.C7) ? "0%" : item.C7) + "</span></p></div>";
+                gdclHtml += "<div class=\"tr\" ><p><span>" + (string.IsNullOrEmpty(item.C8) ? "0" : item.C8) + "</span><span>" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + "</span></p></div>";
                 gdclHtml += "</div>";
             }
 
@@ -1128,7 +1139,7 @@ namespace FineUIPro.Web.common
             var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
             foreach (var item in SbclList)
             {
-                sbclHtml += "<div class=\"tr\">";
+                sbclHtml += "<div class=\"row\">";
                 double SbcllCgl = 0.0;
                 double Sbdhs = 0.0;
                 if (string.IsNullOrEmpty(item.C7))
@@ -1141,10 +1152,10 @@ namespace FineUIPro.Web.common
                     SbcllCgl += Convert.ToDouble(item.C7);
                     Sbdhs += Convert.ToDouble(item.C9);
                 }
-                sbclHtml += "<span class=\"r-line\" style=\"width: 2.9875rem; \">" + item.C2 + "</span>";
-                sbclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + SbcllCgl + "</span>";
-                sbclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + item.C7 + "</span>";
-                sbclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + Sbdhs + "</span>";
+                sbclHtml += "<div class=\"tr\" >" + item.C2 + "</div>";
+                sbclHtml += "<div class=\"tr\" >" + SbcllCgl + "</div>";
+                sbclHtml += "<div class=\"tr\" >" + item.C7 + "</div>";
+                sbclHtml += "<div class=\"tr\" >" + Sbdhs + "</div>";
                 //百分比
                 var dhbfb = "0%";
                 if (SbcllCgl + Sbdhs != 0)
@@ -1152,7 +1163,7 @@ namespace FineUIPro.Web.common
                     dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
 
                 }
-                sbclHtml += "<span class=\"r-line\" style=\"width: .9875rem; \">" + dhbfb + "</span>";
+                sbclHtml += "<div class=\"tr\" >" + dhbfb + "</div>";
                 sbclHtml += "</div>";
             }
         }
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs
index 4846a273..9cfbe500 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs
@@ -30,6 +30,240 @@ namespace FineUIPro.Web.common {
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
         
+        /// <summary>
+        /// divCqmsPxNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCqmsPxNum;
+        
+        /// <summary>
+        /// div_sgfaSpl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl;
+        
+        /// <summary>
+        /// divSafeWorkTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeWorkTime;
+        
+        /// <summary>
+        /// divSafeWorkTimeMonth 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeWorkTimeMonth;
+        
+        /// <summary>
+        /// divSafePersonNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafePersonNum;
+        
+        /// <summary>
+        /// divSafeManagePersonNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeManagePersonNum;
+        
+        /// <summary>
+        /// divWS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWS;
+        
+        /// <summary>
+        /// div_zgsj 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgsj;
+        
+        /// <summary>
+        /// div_zgywc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgywc;
+        
+        /// <summary>
+        /// div_zgwwc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgwwc;
+        
+        /// <summary>
+        /// div_zgwcl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgwcl;
+        
+        /// <summary>
+        /// divProjectDays 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectDays;
+        
+        /// <summary>
+        /// divEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEndDate;
+        
+        /// <summary>
+        /// divRemainingDays 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRemainingDays;
+        
+        /// <summary>
+        /// div_Gzgjsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgjsx;
+        
+        /// <summary>
+        /// div_gjsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx;
+        
+        /// <summary>
+        /// div_Gzdbsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzdbsx;
+        
+        /// <summary>
+        /// div_dbsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx;
+        
+        /// <summary>
+        /// div_Gzgrlc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgrlc;
+        
+        /// <summary>
+        /// div_grlc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_grlc;
+        
+        /// <summary>
+        /// div_ybrw 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw;
+        
+        /// <summary>
+        /// div_gjsxlist 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsxlist;
+        
+        /// <summary>
+        /// div_dbsxlist 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsxlist;
+        
+        /// <summary>
+        /// div_xcrs 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_xcrs;
+        
+        /// <summary>
+        /// div_zyxcrs 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zyxcrs;
+        
+        /// <summary>
+        /// div_glxcrs 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_glxcrs;
+        
         /// <summary>
         /// hiddenUrl 控件。
         /// </summary>