修改移交管理,增加统计报表以及添加字段

This commit is contained in:
2024-08-30 17:45:02 +08:00
parent 7311a2b6fa
commit d21533d599
30 changed files with 885 additions and 271 deletions
@@ -49,16 +49,19 @@
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="650px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
<Tabs>
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" CssStyle="width:100%"
TitleToolTip="图形">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
<div id="divAccidentTime">
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0" CssStyle="width:100%">
<div id="container" style="width: 1300px; height: 580px;"></div>
<%-- <div id="divAccidentTime">
<uc1:ChartControl ID="ChartAccidentTime" runat="server" />
</div>
</div>--%>
</f:ContentPanel>
</Items>
</f:Tab>
@@ -80,13 +83,52 @@
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" MinWidth="150px" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" minWidth="80px" TextAlign="Center"/>
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
@@ -112,14 +154,51 @@
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid2_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" MinWidth="150px" />
<f:RenderField Width="150px" ColumnID="Cat_All_Count" DataField="Cat_All_Count" HeaderText="总" TextAlign="Center" FieldType="Double" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" minWidth="80px" TextAlign="Center" />
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
@@ -145,20 +224,57 @@
runat="server" BoxFlex="1" DataKeyNames="System_No" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid3_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true">
<Columns>
<f:BoundField Width="180px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
<f:BoundField TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." minWidth="80px" />
<f:RenderField Width="180px" TextAlign="Center" ColumnID="SystemNoCount" DataField="SystemNoCount" HeaderText="尾项数量" FieldType="Double" />
<f:GroupField HeaderText="总体情况" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ActualDateCount" DataField="ActualDateCount" HeaderText="已完成数量" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ClearedByCount" DataField="ClearedByCount" HeaderText="Cleared(PIC)" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ConfirmedByCount" DataField="ConfirmedByCount" HeaderText="Confirmed(WUH)" FieldType="Double"/>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="VerifiedByCount" DataField="VerifiedByCount" HeaderText="Verified(BASF)" FieldType="Double"/>
<f:GroupField HeaderText="B" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="C" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="D" TextAlign="Center">
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数:">
@@ -181,3 +297,106 @@
</form>
</body>
</html>
<script type="text/javascript" src="https://registry.npmmirror.com/echarts/5.5.1/files/dist/echarts.min.js"></script>
<script type="text/javascript">
var dom = document.getElementById('container');
var myChart = echarts.init(dom, null, {
renderer: 'canvas',
useDirtyRect: false
});
var app = {};
var option;
option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
}
},
toolbox: {
feature: {
//dataView: { show: true, readOnly: false },
//magicType: { show: true, type: ['line', 'bar'] },
//restore: { show: true },
saveAsImage: { show: true }
}
},
legend: {
data: ['当天计划完成量', '当天实际完成量', '累计计划完成量','累计实际完成量']
},
/*x轴日期*/
xAxis: [
{
type: 'category',
data: [<%=AllxDate%>],
/* data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],*/
axisPointer: {
type: 'shadow'
},
axisLabel: {
interval: 0,
rotate: 40 //值>0向右倾斜,值<0则向左倾斜
}
}
],
/*两边的单位*/
yAxis: [
{
type: 'value',
name: '计划数量',
interval: 20,
axisLabel: {
formatter: '{value}'
}
},
{
type: 'value',
name: '累计数量',
interval: 50,
axisLabel: {
formatter: '{value}'
}
}
],
series: [
{
name: '当天计划完成量',
type: 'bar',
data: [<%=wcl1%>]
},
{
name: '当天实际完成量',
type: 'bar',
data: [<%=wcl2%>]
},
{
name: '累计计划完成量',
type: 'line',
yAxisIndex: 1,
data: [<%=wcl3%>]
},
{
name: '累计实际完成量',
type: 'line',
yAxisIndex: 1,
data: [<%=wcl4%>]
}
]
};
if (option && typeof option === 'object') {
myChart.setOption(option);
}
window.addEventListener('resize', myChart.resize);
</script>