diff --git a/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs
index 9668992e..960de202 100644
--- a/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs
@@ -67,6 +67,10 @@ namespace FineUIPro.Web.HSSE.License
{
this.drpUnitId.SelectedValue = licenseManager.UnitId;
}
+ if (!string.IsNullOrEmpty(licenseManager.CNProfessionalId))
+ {
+ this.drpCNProfessionalId.SelectedValue = licenseManager.CNProfessionalId;
+ }
if (!string.IsNullOrEmpty(licenseManager.LicenseTypeId))
{
this.drpLicenseTypeId.SelectedValue = licenseManager.LicenseTypeId;
@@ -114,6 +118,7 @@ namespace FineUIPro.Web.HSSE.License
private void InitDropDownList()
{
UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+ BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
LicenseTypeService.InitLicenseTypeDropDownList(this.drpLicenseTypeId, true);
UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.ProjectId, false);
}
@@ -177,7 +182,10 @@ namespace FineUIPro.Web.HSSE.License
{
licenseManager.UnitId = this.drpUnitId.SelectedValue;
}
-
+ if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
+ {
+ licenseManager.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
+ }
licenseManager.ApplicantMan = this.txtApplicantMan.Text.Trim();
if (!string.IsNullOrEmpty(this.drpWorkAreaId.SelectedValue))
{
diff --git a/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs
index 6fa0c6b6..81dc818c 100644
--- a/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HSSE.License {
///
protected global::FineUIPro.DropDownList drpUnitId;
+ ///
+ /// drpCNProfessionalId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCNProfessionalId;
+
///
/// drpLicenseTypeId 控件。
///
diff --git a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs
index ce1ed350..d9f844c0 100644
--- a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs
@@ -333,7 +333,44 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
this.Grid1.DataSource = dt;
this.Grid1.DataBind();
- this.ChartEV.CreateMaryChart(dt, 820, 320, null);
+ decimal lastbcws = 0, bcws = 0, lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ dt.Rows[i]["本月已完工作实际费用-ACWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作实际费用-ACWP"].ToString()) / 10000;
+ dt.Rows[i]["本月已完工作预算费用-BCWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作预算费用-BCWP"].ToString()) / 10000;
+ dt.Rows[i]["本月计划工作预算费用-BCWS"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月计划工作预算费用-BCWS"].ToString()) / 10000;
+ bcws = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计计划工作预算费用-BCWS"].ToString());
+ acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作实际费用-ACWP"].ToString());
+ bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作预算费用-BCWP"].ToString());
+ if (bcws == lastbcws)
+ {
+ dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000;
+ }
+ if (acwp == lastacwp)
+ {
+ dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000;
+ }
+ if (bcwp == lastbcwp)
+ {
+ dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000;
+ }
+ lastbcws = bcws;
+ lastacwp = acwp;
+ lastbcwp = bcwp;
+ }
+ this.ChartEV.CreateMaryChart(dt, 1020, 420, null);
}
else
{
@@ -349,7 +386,44 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
this.Grid1.DataSource = dt;
this.Grid1.DataBind();
- this.ChartEV.CreateMaryChart(dt, 820, 320, null);
+ decimal lastbcws = 0, bcws = 0, lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ dt.Rows[i]["本月已完工作实际费用-ACWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作实际费用-ACWP"].ToString()) / 10000;
+ dt.Rows[i]["本月已完工作预算费用-BCWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作预算费用-BCWP"].ToString()) / 10000;
+ dt.Rows[i]["本月计划工作预算费用-BCWS"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月计划工作预算费用-BCWS"].ToString()) / 10000;
+ bcws = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计计划工作预算费用-BCWS"].ToString());
+ acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作实际费用-ACWP"].ToString());
+ bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作预算费用-BCWP"].ToString());
+ if (bcws == lastbcws)
+ {
+ dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000;
+ }
+ if (acwp == lastacwp)
+ {
+ dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000;
+ }
+ if (bcwp == lastbcwp)
+ {
+ dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value;
+ }
+ else
+ {
+ dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000;
+ }
+ lastbcws = bcws;
+ lastacwp = acwp;
+ lastbcwp = bcwp;
+ }
+ this.ChartEV.CreateMaryChart(dt, 1020, 420, null);
}
}
#endregion
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
index 7b2db81e..c10017ff 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
@@ -154,6 +154,8 @@
+
-
-
-
-
-
-
-
-
+ } else if (index == 2) {
+ $("#swiper2").html(swiper_Two)
+ if (todoNum >= slidesNum) {
+ mySwiper = new Swiper('#swiper2', {
+ autoplay: 4000,//可选选项，自动滑动
+ direction: 'vertical',
+ loop: true,
+ slidesPerView: slidesNum
+ })
+ }
+ else {
+ mySwiper = new Swiper('#swiper2', {
+ //autoplay: 4000,//可选选项，自动滑动
+ direction: 'vertical',
+ loop: true,
+ slidesPerView: slidesNum
+ })
+ }
+ }
+ }
+ })
+
+ $("#swiper2").on('click', 'li', function () {
+ var $this = $(this)
+ var data = $this.attr("data-id")
+ var noticeId = $this.attr("notice-id")
+ //$(".project-list-wrap").show();
+ //return
+ if (data != "") {
+ //Window1.GetShowReference(data) + "return false;";
+ document.getElementById("hdNoticeId").value = noticeId;
+ document.getElementById("imgBtn").click();
+ window.open(data);
+ top.window.location.reload();
+ }
+ })
+ var slidesNum = 5
+ var mySwiper = null
+ $(document).ready(function () {
+ var swiper_One = '<%=swiper_One %>'
+ $("#swiper2").css("width", ($("#swiper-pre").width()) + 'px')
+ var height = $("#swiper-pre").height() - 40
+ $("#swiper2").css("height", (height) + 'px')
+ slidesNum = Math.floor((height) / 24)
+ $("#swiper2").html(swiper_One)
+ mySwiper = new Swiper('#swiper2', {
+ autoplay: 4000,//可选选项，自动滑动
+ direction: 'vertical',
+ loop: true,
+ slidesPerView: slidesNum
+ })
+
+ $(".project").hover(function () {
+ $(".project-list").show();
+ }, function () {
+ $(".project-list").hide();
+ });
+
+ $(".project-list>div").click(function () {
+ var $this = $(this)
+ top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
+ });
+
+ $(".js-more-1").click(function () {
+ //var index = 5;
+ //var str = ''
+ ////for (var i = 0; i < (index + 1) * 3; i++) {
+ //// str += '项目' + i + '
'
+ ////}
+ // str += '伊朗马苏化肥项目
'
+ //str += '内蒙古京能锡林煤化有限责任公司锡盟东乌旗褐煤提质项目净化装置
'
+ //str += '印尼PKG合成氨/尿素项目
'
+ //str += '埃及NCIC磷肥项目
'
+ //str += '湖北云华安化工有限公司合成氨搬迁技改项目
'
+ //str += '中煤鄂能化100万吨甲醇技改项目
'
+ //str += '宜都兴发化工有限公司300万吨/年低品位胶磷矿选矿及深加工项目湿法磷酸装置
'
+ //str += '中化云龙有限公司磷矿浆脱除75t/h燃煤锅炉尾气SO2成套设备项目
'
+ //str += '印度塔奇尔化肥项目（煤气化净化标段及合成氨尿素标段）
'
+ //str += '安阳中盈化肥有限公司尿素装置改造工程
'
+ //str += '俄罗斯晓基诺化肥项目
'
+ //str += '南通港吕四港区广汇能源LNG分销转运站2#160000m3储罐项目
'
+ //str += '启东项目
'
+ //str += '荒煤气综合利用年产40万吨乙二醇项目
'
+ //str += '济民可信（高安）清洁能源有限公司江西省建筑陶瓷产业基地清洁工业燃气项目主体装置EPC总承包
'
+ //str += '湖北兴力电子材料有限公司3万吨/年电子级氢氟酸项目
'
+ //str += '呼伦贝尔金新化工有限公司新增备用锅炉技改项目总承包工程
'
+ //str += '大石净水厂污泥干化减量服务项目
'
+ //str += '广汇启东扩建5#20万m3LNG储罐工程项目
'
+ //str += '东华能源（茂名）烷烃资源综合利用项目配套库区（一期）项目低温罐区（I）EPC项目
'
+ //str += '江苏嘉盛燃气有限公司嘉盛LNG调峰储配站工程
'
+ //str += '山东滨州临港化工产业园首站项目
'
+ //str += '五环天地项目
'
+ //$("#projectList").html(str)
+ //$(".project-list-wrap").show();
+ window.open("../JDGL/Check/TotalCompletion.aspx");
+ })
+
+ $(".js-more-2").click(function () {
+ window.open("../JDGL/Check/ProgressCompletion.aspx");
+ })
+
+ $(".js-more-3").click(function () {
+ window.open("../HSSE/SitePerson/PersonList.aspx");
+ })
+
+ $("#projectList_btn").click(function () {
+ $(".project-list-wrap").hide();
+ })
+
+ // 计算表格最大高度
+ var maxheight = $("#swiper-pre").height() * 2 - 72 -20
+ //debugger
+ $(".jd-list-long").css("max-height", maxheight)
+
+ })
+