修改看板

DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql

@@ -0,0 +1,5 @@
+
+CREATE NONCLUSTERED INDEX [t_d_facerecord_Projectid_Index]
+ON [dbo].[t_d_facerecord] ([ProjectId])
+INCLUDE ([ID],[EmployName],[DepartmentID],[DepartName],[AreaID],[AreaName],[EmployNO],[CardID],[RoleID],[DateTimeRecord],[RecordDes],[FaceIP],[InOrOut],[Des1],[Des2],[Des3],[Des4])
+;

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -19248,7 +19248,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs

@@ -788,8 +788,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
                     model.InspectionSummaryId = Guid.NewGuid().ToString();
                     model.InspectionSummaryMbId = "24";
-                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).FirstOrDefault();
+                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).Select(x=>x.ID).FirstOrDefault();
-                    if (Rykq !=null)
+                    if (Rykq !=0)
                     {
                         model.SummeryResult = "已对接";
                     }

SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx

@@ -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

@@ -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

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
+namespace FineUIPro.Web
+{
 
 
-    public partial class mainMenu_TestRun {
+    public partial class mainMenu_TestRun
+    {
 
         /// <summary>
         /// Head1 控件。
@@ -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

@@ -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'
                 },

SGGL/FineUIPro.Web/index.aspx

@@ -162,9 +162,9 @@
         .bgbtn_head {
             display: inline-block;
             position: absolute;
-            width: 40%;
+            width: 96%;
             height: 50%;
-            left: 30%;
+            left: 2%;
             top: 0;
             background: none !important;
             border: none !important;