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

修改看板

Browse Source
This commit is contained in:
潘鸿锋
2024-09-12 14:14:08 +08:00
parent ed678050b4
commit 0732a5021c
8 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+2 -2
View File
@@ -116,7 +116,7 @@
<div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">投料试车进度</div>
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="tlscNum" runat="server">投料试车进度</div>
</div>
</div>
<div class="tab-wrap">
@@ -143,7 +143,7 @@
<div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">试运行进度</div>
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="syxNum" runat="server">试运行进度</div>
</div>
</div>
<div class="tab-wrap">
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
+2
View File
@@ -290,6 +290,7 @@ namespace FineUIPro.Web
InstallationName = item.InstallationName
});
}
tlscNum.InnerHtml = "投料试车进度(" + result.Count.ToString() + ")";
feedingRunStr = JsonConvert.SerializeObject(result);
}
}
@@ -312,6 +313,7 @@ namespace FineUIPro.Web
InstallationName = item.InstallationName
});
}
syxNum.InnerHtml = "试运行进度(" + result.Count.ToString() + ")";
productsStr = JsonConvert.SerializeObject(result);
}
}
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
Generated
+25 -5
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web {
public partial class mainMenu_TestRun {
namespace FineUIPro.Web
{
public partial class mainMenu_TestRun
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,5 +22,23 @@ namespace FineUIPro.Web {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// tlscNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl tlscNum;
/// <summary>
/// syxNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl syxNum;
}
}
SGGL/FineUIPro.Web/common/main_new.aspx
+6 -6
View File
@@ -1919,23 +1919,23 @@
textStyle: {
rich: {
a: {
fontSize: 14,
fontSize: 12,
color: '#DADADA',
},
b: {
color: '#FFFFFF',
fontSize: 14,
fontSize: 12,
},
c: {
padding: [0, 6],
fontSize: 14,
fontSize: 12,
color: '#FFFFFF',
},
d: {
fontSize: 14,
fontSize: 12,
color: '#12CDA2',
}
}
},
}
},
],
@@ -2325,7 +2325,7 @@
},
axisLabel: {
interval: 0,
rotate: -16, // 如果数据较多时旋转标签以避免重叠
rotate: -10, // 如果数据较多时旋转标签以避免重叠
margin: 8, // 设置标签与轴线之间的距离
// align: 'center'
},