diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 8e6bcea..c1dde21 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -20037,7 +20037,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
diff --git a/SGGL/FineUIPro.Web/ReportManage/SafeEnvBudget/SafeEnvBudget.aspx b/SGGL/FineUIPro.Web/ReportManage/SafeEnvBudget/SafeEnvBudget.aspx
index d349f82..83817d3 100644
--- a/SGGL/FineUIPro.Web/ReportManage/SafeEnvBudget/SafeEnvBudget.aspx
+++ b/SGGL/FineUIPro.Web/ReportManage/SafeEnvBudget/SafeEnvBudget.aspx
@@ -7,143 +7,136 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>安全环境预算</title>
     <style type="text/css">
-        .labcenter
-        {
+        .labcenter {
             text-align: center;
         }
-          .LabelColor
-        {
+
+        .LabelColor {
             color: Red;
-            font-size:small;
-        }   
-         .f-grid-row.Yellow
-        {
+            font-size: small;
+        }
+
+        .f-grid-row.Yellow {
             background-color: Yellow;
-        } 
-        .f-grid-row.Green
-        {
+        }
+
+        .f-grid-row.Green {
             background-color: LightGreen;
         }
-          .f-grid-row.Red
-        {
+
+        .f-grid-row.Red {
             background-color: Red;
         }
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全环境预算" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="BudgetId" DataIDField="BudgetId" AllowSorting="true"   SortField="Subject1,Subject2,Subject3,Subject4,Subject5"
-                SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
-                OnRowCommand="Grid1_RowCommand">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items> 
-                            <f:DropDownList ID="drpYear" runat="server" Label="年度"  AutoPostBack="true" 
-                                OnSelectedIndexChanged="drpYear_SelectedIndexChanged" Width="180px"
-                                EnableEdit="true" ShowLabel="true" LabelWidth="50px">
-                                
-                            </f:DropDownList>
-                            <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="日期" ID="txtStartTime"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="150px" LabelWidth="50px">
-                            </f:DatePicker>
-                            <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="至" ID="txtEndTime"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="140px" LabelWidth="30px">
-                            </f:DatePicker>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全环境预算" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="BudgetId" DataIDField="BudgetId" AllowSorting="true" SortField="Subject1,Subject2,Subject3,Subject4,Subject5"
+                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
+                    OnRowCommand="Grid1_RowCommand">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpYear" runat="server" Label="年度" AutoPostBack="true"
+                                    OnSelectedIndexChanged="drpYear_SelectedIndexChanged" Width="180px"
+                                    EnableEdit="true" ShowLabel="true" LabelWidth="50px">
+                                </f:DropDownList>
+                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="日期" ID="txtStartTime"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="150px" LabelWidth="50px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="至" ID="txtEndTime"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="140px" LabelWidth="30px">
+                                </f:DatePicker>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Hidden="true">
+                                </f:Button>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="Subject1" DataField="Subject1"
+                            SortField="Subject1" FieldType="String" HeaderText="一级" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Subject2" DataField="Subject2"
+                            SortField="Subject2" FieldType="String" HeaderText="二级" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Subject3" DataField="Subject3"
+                            SortField="Subject3" FieldType="String" HeaderText="三级" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Subject4" DataField="Subject4"
+                            SortField="Subject4" FieldType="String" HeaderText="四级" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Subject5" DataField="Subject5"
+                            SortField="Subject5" FieldType="String" HeaderText="五级" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="BudgetAmount" DataField="BudgetAmount"
+                            SortField="BudgetAmount" FieldType="Double" HeaderText="预算(万元)" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
+                            FieldType="Date" Renderer="Date" HeaderText="编辑日期" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                            SortField="FlowOperateName" FieldType="String" HeaderText="状态" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
 
 
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1"
-                                 >
-                            </f:Button>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"  
-                                Hidden="true">
-                            </f:Button>
-                            
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>    
-                      <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="100px" ColumnID="Subject1" DataField="Subject1"
-                        SortField="Subject1" FieldType="String" HeaderText="一级" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                   <f:RenderField Width="100px" ColumnID="Subject2" DataField="Subject2"
-                        SortField="Subject2" FieldType="String" HeaderText="二级" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="Subject3" DataField="Subject3"
-                         SortField="Subject3" FieldType="String" HeaderText="三级" TextAlign="Left"
-                         HeaderTextAlign="Center">
-                     </f:RenderField>
-                     <f:RenderField Width="100px" ColumnID="Subject4" DataField="Subject4"
-                          SortField="Subject4" FieldType="String" HeaderText="四级" TextAlign="Left"
-                          HeaderTextAlign="Center">
-                      </f:RenderField>
-                      <f:RenderField Width="100px" ColumnID="Subject5" DataField="Subject5"
-                           SortField="Subject5" FieldType="String" HeaderText="五级" TextAlign="Left"
-                           HeaderTextAlign="Center">
-                       </f:RenderField>
-                       <f:RenderField Width="100px" ColumnID="BudgetAmount" DataField="BudgetAmount"
-                         SortField="BudgetAmount" FieldType="Double" HeaderText="预算(万元)" TextAlign="Left"
-                         HeaderTextAlign="Center">
-                     </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
-                        FieldType="Date" Renderer="Date" HeaderText="编辑日期" TextAlign="Center" HeaderTextAlign="Center">
-                    </f:RenderField> 
-                    <f:RenderField Width="100px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                         SortField="FlowOperateName" FieldType="String" HeaderText="状态" TextAlign="Left"
-                         HeaderTextAlign="Center">
-                     </f:RenderField>
-                      
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                        <f:ToolbarFill runat="server">
+                        </f:ToolbarFill>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="详细" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="1000px" Height="540px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                    Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
 
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                    <f:ToolbarFill runat="server">
-                    </f:ToolbarFill>                     
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="详细" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1000px" Height="540px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <Items>
-            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-            </f:MenuButton> 
-            
-            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-            </f:MenuButton>
-        </Items>
-    </f:Menu>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                    Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
@@ -156,11 +149,11 @@
 
         function onGridDataLoad(event) {
             this.mergeColumns(['Subject1', 'Subject2', 'Subject3', 'Subject4', 'Subject5'], { depends: true });
-//            this.mergeColumns(['Subject1']);
-//            this.mergeColumns(['CheckPersonName']);
-//            this.mergeColumns(['CheckTime']);
-//            this.mergeColumns(['FlowOperateName']);
-        }  
+            //            this.mergeColumns(['Subject1']);
+            //            this.mergeColumns(['CheckPersonName']);
+            //            this.mergeColumns(['CheckTime']);
+            //            this.mergeColumns(['FlowOperateName']);
+        }
     </script>
 </body>
 </html>
