lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-12

Browse Source
This commit is contained in:
李鹏飞
2023-10-12 19:33:22 +08:00
parent 7d87e48818
commit d1c7977da2
24 changed files with 688 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/css/project.css
+52 -13
View File
@@ -14,7 +14,22 @@
justify-content: space-between;
padding: 20px 0;
}
.th > p > .s1 {
width: 33.33%;
display: inline-block;
text-align: center;
height: auto;
line-height: normal;
}
.tr1 {
display: flex;
color: #FFFFFF;
font-size: .175rem;
/* height: .425rem;
    line-height: .425rem; */
}
.y_rgs {
width: 149px;
height: 70px;
@@ -408,12 +423,21 @@
text-align: center;
height: 100%;
}
.th>p{
text-align: center;
height: 50%;
line-height: .425rem;
text-align: center;
}
.th > p {
text-align: center;
height: 50%;
line-height: .425rem;
text-align: center;
}
.th:nth-child(2) > p {
text-align: center;
height: 50%;
line-height: .425rem;
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.b-line{
border-bottom: 1px solid #1B538B;
}
@@ -424,16 +448,19 @@
width: 50%;
display: inline-block;
text-align: center;
height: 100%;
line-height: .475rem;
height: 100%;
line-height: .475rem;
}
.tr{
display: flex;
color: #FFFFFF ;
font-size: .175rem;
height: .425rem;
line-height: .425rem;
height: .425rem;
line-height: .425rem;
}
.tr>.th{
}
.tr>span{
text-align: center;
@@ -498,8 +525,20 @@ overflow: hidden;
}
.gj{
position: absolute;
top: .125rem;
right: .25rem;
top: 0;
left: .25rem;
}
.gj1{
position: absolute;
top: 0;
right: 0;
}
.gj1>span{
padding: .05rem .25rem;
font-size: .175rem;
color: #ffffff;
}
.gj>span{
font-size: .175rem;
@@ -507,7 +546,7 @@ overflow: hidden;
}
.gj>span:nth-child(2){
color: #E9E931;
font-size: .3rem;
font-size: .225rem;
margin-left: .125rem;
}
SGGL/FineUIPro.Web/common/mainProject2.aspx
+62 -7
View File
@@ -247,15 +247,55 @@
</div>
</div>
<div class="y_box" style="width: 100%;">
<div class="y_box_label y_image_default">赢得值曲线
<%--<div class="gj"><span>关键事项准点率</span><span>90%</span></div>--%>
<div class="y_box" style="width: 100%;">
<div class="y_box_label y_image_default" style="background-image: none;">
<!-- <div class="y_tabs y_row"><span class="y_image_default y_tab-action">赢得值曲线</span><span
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>
<div class="y_box_main" id='left_one' style="width: 100%; height: 90%;"></div>
<%--<div class="y_box_main" id="jdmap">
</div>--%>
<div class="y_box_main" id="jdmap" >
<div id='left_one' style="width: 100%; height: 100%;"></div>
</div>
<div class="y_box_main" id="jdmap1" style="display: none;">
<div class="table" style="width: 100%;">
<div class="thead">
<div class="trth" style="background: rgba(33, 55, 113, .4);">
<div class="th r-line" style="width: .625rem;">
<p>序号</p>
</div>
<div class="th r-line" style="width: 1rem;">
<p>类型</p>
</div>
<div class="th r-line" style="width: .8375rem;">
<p>单位</p>
</div>
<div class="th r-line" style="width: .8375rem;">
<p>设计数量</p>
</div>
<div class="th r-line" style="width: 2.325rem;">
<p class="b-line">本期</p>
<p><span class="r-line s1">计划完成</span><span class="r-line s1">实际完成</span><span
class="r-line s1" style="border: none;">完成率</span></p>
</div>
<div class="th r-line" style="width: 2.325rem;">
<p class="b-line">累计</p>
<p><span class="r-line s1">计划完成</span><span class="r-line s1">实际完成</span><span
class="r-line s1" style="border: none;">完成率</span></p>
</div>
<div class="th r-line" style="width: .8375rem;">
<p>完成率</p>
</div>
</div>
</div>
<div class="tbody">
<%=swgclHtml %>
</div>
</div>
</div>
</div>
<div class="y_box" style="width: 100%;">
<div class="y_box_label y_image_default">质量概况</div>
@@ -448,6 +488,21 @@
}
</script>
<script>
$('.gj1>span').click(function () {
console.log($(this).data('type'))
let type = $(this).data('type')
$('.gj1>span').removeClass('y_image_default y_tab-action')
$(this).addClass('y_image_default y_tab-action')
if (type == 1) {
// 赢得值曲线
$("#jdmap1").hide()
$("#jdmap").show()
} else if (type == 2) {
// 实物工程量
$("#jdmap").hide()
$("#jdmap1").show()
}
})
// 焊接一次合格率
hjmap()
function hjmap() {
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+55 -8
View File
@@ -1,4 +1,8 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage;
using Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -99,7 +103,7 @@ namespace FineUIPro.Web.common
//施工审批量
int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count();
div_sgfaSpl.InnerHtml = sgspl.ToString();
GetJD();
//质量共检
getZlgj();
@@ -303,6 +307,7 @@ namespace FineUIPro.Web.common
{
string url = getImag.AttachUrl.Replace('\\', '/');
var UrlList = Funs.GetStrListByStr(url, ',');
bool isHiddDefaultImg = false;
foreach (var item in UrlList)
{
if (!string.IsNullOrEmpty(item))
@@ -312,13 +317,15 @@ namespace FineUIPro.Web.common
if (File.Exists(atturl) && allowExtensions.Contains(fileType))
{
isHiddDefaultImg=true;
divProjectImg += string.Format(" <div class=\"swiper-slide\"><img src=\"{0}\"></div>", atturl.Replace(Funs.RootPath,"/"));
//this.divProjectImgs.Src = divProjectImg;
}
}
}
divProjectImg= divProjectImg.Replace("<div class=\"swiper-slide\"><img src=\"./imags/16.png\"></div>", "");
/*string firtstUrl = Funs.GetStrListByStr(url, ',').FirstOrDefault();
if (!string.IsNullOrEmpty(firtstUrl))
{
@@ -487,7 +494,7 @@ namespace FineUIPro.Web.common
#region 作业许可
protected int getTodayCount()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.CompileDate.Value.Date == DateTime.Now.Date).ToList().Count;
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.WorkStatesStr == "作业中").ToList().Count;
return result;
}
protected int getAllCount()
@@ -501,26 +508,26 @@ namespace FineUIPro.Web.common
/// <returns></returns>
protected int getWrokCount0()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证").ToList().Count;
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" &&x.WorkStatesStr=="作业中").ToList().Count;
return result;
}
protected int getWrokCount1()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证").ToList().Count;
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result;
}
protected int getWrokCount2()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证").ToList().Count;
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result;
}
protected int getWrokCount3()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId
&& x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证").ToList().Count;
&& x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result;
}
#endregion
@@ -548,7 +555,7 @@ namespace FineUIPro.Web.common
select x).Count();
var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
zlzgl = zgl.ToString();
zlzgl = zgl.ToString().Replace("NaN", "0") ;
zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
}
#endregion
@@ -639,6 +646,31 @@ namespace FineUIPro.Web.common
#endregion
#region 赢得值曲线
protected string swgclHtml;
protected void GetJD()
{
int index = 0;
var result = Funs.DB.View_JDGL_QuantityCompletion
.Where(qc => qc.ProjectId == this.CurrUser.LoginProjectId)
.OrderBy(qc => qc.SortIndex)
.ThenBy(qc => qc.Name)
.ToList();
foreach (var item in result)
{
swgclHtml += "<div class=\"tr1\">";
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: .625rem;\"><p>{0}</p></div>",index);
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: 1rem;\"><p>{0}</p> </div>",item.Name);
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: .8375rem;\"><p>{0}</p> </div>",item.Unit);
swgclHtml += string.Format(" <div class=\"th r-line\" style=\"width: .8375rem;\"><p>{0}</p> </div>",item.DesignNum);
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: 2.325rem;\"><p><span class=\"r-line s1\">{0}</span><span class=\"r-line s1\">{1}</span><span class=\"r-line s1\" style=\"border: none;\">{2}</span></p> </div>",item.PlanNum,item.RealNum,item.Rate);
swgclHtml += string.Format(" <div class=\"th r-line \" style=\"width: 2.325rem;\"><p><span class=\"r-line s1\">{0}</span><span class=\"r-line s1\">{1}</span><span class=\"r-line s1\" style=\"border: none;\">{2}</span></p> </div>",item.TotalPlanNum,item.TotalRealNum,item.TotalRate);
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: .8375rem;\"><p>{0}</p> </div>",item.SumRate);
swgclHtml += " </div>";
}
}
protected string Two
{
get
@@ -866,6 +898,7 @@ namespace FineUIPro.Web.common
#region 工作台面
protected string gjsxRate = "0";
protected void getGztm()
{
//div_dbsxlist.InnerHtml = "";
@@ -961,8 +994,22 @@ namespace FineUIPro.Web.common
}
this.div_gjsxlist.InnerHtml = returnDbHtml;
List<SqlParameter> listStaticListStr = new List<SqlParameter>();
listStaticListStr.Add(new SqlParameter("@UserID", null));
listStaticListStr.Add(new SqlParameter("@unit", null));
listStaticListStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId));
listStaticListStr.Add(new SqlParameter("@CNProfessional_ID", null));
listStaticListStr.Add(new SqlParameter("@questionType", null));
listStaticListStr.Add(new SqlParameter("@processMan", null)); listStaticListStr.Add(new SqlParameter("@User_Acceptance", null));
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());
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
gjsxRate = gjsxRate.ToString().Replace("NaN", "0")+"%";
}
#endregion