提交代码

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

SGGL/FineUIPro.Web/Global.asax.cs

@@ -37,7 +37,16 @@
                 ErrLogInfo.WriteLog(string.Empty, ex);
                 //AppDomain.Unload(AppDomain.CurrentDomain);
             }
-          
+            ////材料软件定时
+            try
+            {
+                BLL.MonitorService.StartGetPipelineWeldingQuantities();
+                BLL.MCSWebService.StartMonitor();
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog("材料软件定时器启动失败!", ex);
+            }
 
             if (ConfigurationManager.AppSettings["EnableRealName"] == "True")
             {
@@ -104,16 +113,6 @@
                 {
                     ErrLogInfo.WriteLog("自动校正人工时定时器启动失败!", ex);
                 }
-                ////材料软件定时
-                try
-                {
-                    BLL.MonitorService.StartGetPipelineWeldingQuantities();
-                    BLL.MCSWebService.StartMonitor();
-                }
-                catch (Exception ex)
-                {
-                    ErrLogInfo.WriteLog("材料软件定时器启动失败!", ex);
-                }
 
                 ////从博晟获取培训考试数据定时器
                 try

SGGL/FineUIPro.Web/Web.config

@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

SGGL/FineUIPro.Web/common/main_new.aspx

@@ -54,7 +54,7 @@
                         </div>
                         <div class="y_aq y_row">
                             <div class="y_aq_box y_image_default y_row">
-                                <div class="y_aq_label">安全管理人员</div>
+                                <div class="y_aq_label js-hover" data-type="QualityProblem">安全管理人员</div>
                                 <div class="y_aq_value"  id="divSafeManagePersonNum" runat="server">0</div>
                             </div>
                             <div class="y_aq_box y_image_default y_row js-hover" data-type="AccidentEventData">

SGGL/FineUIPro.Web/common/main_new.aspx.cs

@@ -62,7 +62,8 @@ namespace FineUIPro.Web.common
                              select x;
                 var glAllPerson = from x in allSum
                                   join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                  where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                  //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                  where y.IsHsse == true
                                   select x;
                 this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
 
@@ -571,7 +572,7 @@ namespace FineUIPro.Web.common
             List<double> listdata = new List<double>();
             double result = 0;
             Model.SGGLDB db = Funs.DB;
-            var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName== "工艺管道" select x;
+            var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
             decimal a = 0, b = 0;
             if (ndtLists.Count() > 0)
             {

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />