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

Compare commits

base: lpf:851f6790ede5a99773f938a5a70c2ae65d1b6ab4
Branches Tags
lpf:master
lpf:panhf_20240125
...
compare: lpf:88067caa9c86e8404aac46a912efa661172cb3a1
Branches Tags
lpf:master
lpf:panhf_20240125

4 Commits
851f6790ed ... 88067caa9c

Author SHA1 Message Date
潘鸿锋 88067caa9c 修改关键事项 2024-12-11 09:52:23 +08:00
潘鸿锋 8a443d509a Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-12-11 09:43:27 +08:00
潘鸿锋 d8e79a9fd8 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-12-04 09:08:37 +08:00
潘鸿锋 64fccea3f3 开车面板 2024-12-04 09:08:33 +08:00
4 changed files with 60 additions and 31 deletions
Show Stats Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19321,7 +19321,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

43
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -345,6 +345,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
} }
if (state == "0") { if (state == "0") {
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2Binging();
Button1.Hidden = true; Button1.Hidden = true;
} }
//rblIsClosed.Visible = false; //rblIsClosed.Visible = false;
@ -792,19 +796,44 @@ namespace FineUIPro.Web.PZHGL.GJSX
string EditType = Request.Params["EditType"]; string EditType = Request.Params["EditType"];
if (EditType == "add") string ID = Request.Params["ID"];
if (string.IsNullOrEmpty(ID))
{ {
save("2"); save("2");
} }
else { else
//责任人的时候保存关键事项 {
var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text); var model = GJSXService.GetGJSXById(ID);
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) var state = model.State.Trim();
if (state == "1")
{ {
save("3"); save("2");
OperateComplianceObligationsCSort(); }
else {
//责任人的时候保存关键事项
var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{
save("3");
OperateComplianceObligationsCSort();
}
} }
} }
//if (EditType == "add")
//{
// save("2");
//}
//else {
// //责任人的时候保存关键事项
// var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
// if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
// {
// save("3");
// OperateComplianceObligationsCSort();
// }
//}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());

2
SGGL/FineUIPro.Web/TestRun/DriverProgressEdit.aspx.cs
View File

@ -64,7 +64,7 @@ namespace FineUIPro.Web.TestRun
{ {
this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_DriverProgress)); this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_DriverProgress));
} }
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", this.hdId.Text, BLL.Const.DriverProgressMenuId))); PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", this.hdId.Text, BLL.Const.DriverProgressMenuId)));
} }
#endregion #endregion

44
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
View File

@ -123,9 +123,9 @@
<div class="tab" data-value="1"> <div class="tab" data-value="1">
<div class="t-item" style="background-color: #DD226D">未投料</div> <div class="t-item" style="background-color: #DD226D">未投料</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #57C43C">投料中</div> <div class="t-item" style="background-color: #FFA500">投料中</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #B3764D">投料完成</div> <div class="t-item" style="background-color: #57C43C">投料完成</div>
</div> </div>
</div> </div>
<div class="bw-item-content"> <div class="bw-item-content">
@ -148,9 +148,9 @@
</div> </div>
<div class="tab-wrap"> <div class="tab-wrap">
<div class="tab" data-value="1"> <div class="tab" data-value="1">
<div class="t-item" style="background-color: #B3764D">未运行</div> <div class="t-item" style="background-color: #DD226D">未运行</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #DD226D">运行中</div> <div class="t-item" style="background-color: #FFA500">运行中</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #57C43C">停车检修</div> <div class="t-item" style="background-color: #57C43C">停车检修</div>
</div> </div>
@ -171,9 +171,9 @@
</div> </div>
<div class="tab-wrap"> <div class="tab-wrap">
<div class="tab" data-value="1"> <div class="tab" data-value="1">
<div class="t-item" style="background-color: #B3764D">考核未开始</div> <div class="t-item" style="background-color: #DD226D">考核未开始</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #DD226D">考核进行中</div> <div class="t-item" style="background-color: #FFA500">考核进行中</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item" style="background-color: #57C43C">考核已完成</div> <div class="t-item" style="background-color: #57C43C">考核已完成</div>
</div> </div>
@ -507,7 +507,7 @@
var fiveStr = '<%=productsStr%>'; var fiveStr = '<%=productsStr%>';
var fiveData = JSON.parse(fiveStr); var fiveData = JSON.parse(fiveStr);
var fivewidth = Math.floor(100 / (fiveData.length / 2)); var fivewidth = Math.floor(100 / (fiveData.length / 2));
$.each(fourData, function (index, item) { $.each(fiveData, function (index, item) {
$("#five").append("<div id='five" + index + "' style='width:129px; height:148px; display:inline-block'></div>"); $("#five").append("<div id='five" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
}); });
@ -521,12 +521,12 @@
//if (sixData.States == 3) { //if (sixData.States == 3) {
// colorData = ["#106722", "#20CE43", "#5DE679"]; // colorData = ["#106722", "#20CE43", "#5DE679"];
//} //}
var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
if (sixData.States == 2) { if (sixData.States == 2) {
colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"]; colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
} }
if (sixData.States == 3) { if (sixData.States == 3) {
colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"]; colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
} }
var chart = echarts.init(document.getElementById('six')); var chart = echarts.init(document.getElementById('six'));
var value = 100; var value = 100;
@ -823,10 +823,10 @@
//} //}
var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"]; var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
if (item.RunType == 2) { if (item.RunType == 2) {
colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"]; colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
} }
if (item.RunType == 3) { if (item.RunType == 3) {
colorData = ["#B3764D", "#B3764D", "#B3764D", "#B3764D"]; colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
} }
var chart = echarts.init(document.getElementById('four' + index)); var chart = echarts.init(document.getElementById('four' + index));
var value = 100; var value = 100;
@ -843,15 +843,15 @@
text: `` + sname, text: `` + sname,
subtext: item.RunType == 1 ? "未投料" : item.RunType == 2 ? "投料中" : "投料完成", subtext: item.RunType == 1 ? "未投料" : item.RunType == 2 ? "投料中" : "投料完成",
left: 'center', left: 'center',
top: '45%', //top待调整 top: '35%', //top待调整
textStyle: { textStyle: {
color: '#fff', color: '#fff',
fontSize: 10, fontSize: 13,
fontFamily: 'Microsoft YaHei', fontFamily: 'Microsoft YaHei',
}, },
subtextStyle: { subtextStyle: {
color: '#fff', color: '#fff',
fontSize: 10, fontSize: 13,
fontFamily: 'Microsoft YaHei', fontFamily: 'Microsoft YaHei',
top: 'center' top: 'center'
}, },
@ -928,13 +928,13 @@
}); });
$.each(fiveData, function (index, item) { $.each(fiveData, function (index, item) {
var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
if (item.RunType == 2) { if (item.RunType == 2) {
colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"]; colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
} }
if (item.RunType == 3) { if (item.RunType == 3) {
colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"]; colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
} }
var chart = echarts.init(document.getElementById('five' + index)); var chart = echarts.init(document.getElementById('five' + index));
var value = 100; var value = 100;
@ -951,15 +951,15 @@
text: sname, text: sname,
subtext: item.RunType == 1 ? "未运行" : item.RunType == 2 ? "运行中" : "停车检修", subtext: item.RunType == 1 ? "未运行" : item.RunType == 2 ? "运行中" : "停车检修",
left: 'center', left: 'center',
top: '45%', //top待调整 top: '35%', //top待调整
textStyle: { textStyle: {
color: '#fff', color: '#fff',
fontSize: 10, fontSize: 13,
fontFamily: 'Microsoft YaHei', fontFamily: 'Microsoft YaHei',
}, },
subtextStyle: { subtextStyle: {
color: '#ff', color: '#ff',
fontSize: 9, fontSize: 13,
fontFamily: 'Microsoft YaHei', fontFamily: 'Microsoft YaHei',
top: 'center' top: 'center'
}, },