提交代码

2024-06-14 16:52:37 +08:00
parent 0860e6b9b1
commit 2a16ec833a
60 changed files with 114585 additions and 1272 deletions
@@ -97,9 +97,9 @@ namespace FineUIPro.Web.common
                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x).Count();
                    pcount3 = Count3();
                }
-                div_zjxmCount.InnerText = pcount1.ToString();
-                div_cjrsCount.InnerText = pcount2.ToString();
-                div_wdgcCount.InnerText = pcount3.ToString();
+                div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">个</div>";
+                div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">人</div>";
+                div_wdgcCount.InnerHtml = pcount3.ToString() + "<div class=\"th\">个</div>";

                //质量问题
                getZlwt();
@@ -476,6 +476,50 @@ namespace FineUIPro.Web.common
                return JsonConvert.SerializeObject(series);
            }
        }
+        #endregion
+
+        #region  项目信息
+        protected string Project2
+        {
+            get
+            {
+                Model.SingleSerie series = new Model.SingleSerie();
+                var project1s = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null);
+                Model.SGGLDB db = Funs.DB;
+                string str = string.Empty;
+                foreach (var item in allProjects)
+                {
+                    if (!string.IsNullOrEmpty(item.MapCoordinates))
+                    {
+                        string startDate = string.Empty;
+                        string endDate = string.Empty;
+                        string residueDay = string.Empty;
+                        if (item.StartDate != null)
+                        {
+                            startDate = string.Format("{0:yyyy-MM-dd}", item.StartDate);
+                        }
+                        if (item.EndDate != null)
+                        {
+                            endDate = string.Format("{0:yyyy-MM-dd}", item.EndDate);
+                            //获取剩余天数
+                            residueDay = DateDiff(DateTime.Now, Convert.ToDateTime(item.EndDate)).ToString();
+                        }
+                        decimal jdNum = 0;
+                        if (item.Progress != null)
+                        {
+                            jdNum = item.Progress.Value;
+                        }
+
+                        str += "{name: '" + item.ShortName + "', value: [" + item.MapCoordinates + ", { value:'" + item.ShortName + "',value2:'" + startDate + "',value3:'" + endDate + "',value4:'" + residueDay + "',value5:'" + jdNum.ToString("0.##") + "%'}]},";
+                    }
+                }
+                if (!string.IsNullOrEmpty(str))
+                {
+                    str = str.Substring(0, str.Length - 1);
+                }
+                return str;
+            }
+        }

        /// <summary>
        /// 计算时间的相差天数
@@ -501,7 +545,7 @@ namespace FineUIPro.Web.common
        protected int Count3()
        {
            int cout1 = 0;
-            cout1 = LargerHazard.Where(x => x.States == Const.State_2).Count();
+            cout1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == Const.State_2).Count();
            return cout1;
        }
        #endregion
@@ -669,15 +713,12 @@ namespace FineUIPro.Web.common
                MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count();
            }

-            if (AllCount > 0)
-            {
-                ////当前现场总人数
-                div_xcrs.InnerHtml = AllCount.ToString();
-                //作业人数
-                div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
-                //管理人数
-                div_glxcrs.InnerHtml = MCount.ToString();
-            }
+            ////当前现场总人数
+            div_xcrs.InnerHtml = AllCount.ToString();
+            //作业人数
+            div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
+            //管理人数
+            div_glxcrs.InnerHtml = MCount.ToString();
        }
        #endregion

@@ -705,7 +746,7 @@ namespace FineUIPro.Web.common
            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
            foreach (var item in list)
            {
-                ProjectJd += "'" + item.Progress + "',";
+                ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
                ProjectMc += "'" + item.ShortName + "',";
            }
            ProjectJd = ProjectJd.TrimEnd(',');
@@ -719,7 +760,7 @@ namespace FineUIPro.Web.common
            div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
            div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
            div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
-            div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())) + "%";
+            div_zgwcl.InnerHtml = (100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).ToString("0.##") + "%";
        }

        /// <summary>
@@ -750,8 +791,8 @@ namespace FineUIPro.Web.common
        protected string gdclHtml;
        protected string sbclHtml;

-        protected string gdclHead = "<span>项目</span><span>管子</span><span>管件</span><span>阀门</span><span>垫片</span><span>紧固件</span>";
-        protected string sbclHead = "<span>项目</span><span>采购量</span><span>到货量</span><span>已到货百分比</span>";
+        protected string gdclHead = "<div class=\"th-p\">项目</div><div class=\"th-p\">管子</div><div class=\"th-p\">管件</div><div class=\"th-p\">阀门</div><div class=\"th-p\">垫片</div><div class=\"th-p\">紧固件</div>";
+        protected string sbclHead = "<div class=\"th-p\">项目</div><div class=\"th-p\">采购量</div><div class=\"th-p\">到货量</div><div class=\"th-p\">已到货百分比</div>";
        private void getCldh()
        {

@@ -762,73 +803,73 @@ namespace FineUIPro.Web.common
            foreach (var item in list)
            {
                #region 管道材料
-                gdclHtml += " <div class=\"tr\">";
+                gdclHtml += " <div class=\"row\">";
                var pname = item.ShortName;
                if (item.ShortName.Length > 3)
                {
                    pname = item.ShortName.Substring(0, 3) + "...";
                }

-                gdclHtml += "<span title=\"" + item.ShortName + "\">" + pname + "</span>";
+                gdclHtml += "<div class=\"th-p\" title =\"" + item.ShortName + "\">" + pname + "</div>";
                var pid = BLL.ProjectService.GetCLProjectCodeByProjectId(item.ProjectId).ToString();
                //管子
                var num1 = PipelinList.Where(x => x.ProjectId == pid && x.C1 == "管子").FirstOrDefault();
                if (num1 != null)
                {
-                    gdclHtml += "<span>" + (num1.C7 == "" ? "0%" : num1.C7) + "</span>";
+                    gdclHtml += "<div class=\"th-p\">" + (num1.C7 == "" ? "0%" : num1.C7) + "</div>";
                }
                else
                {
-                    gdclHtml += "<span>0%</span>";
+                    gdclHtml += "<div class=\"th-p\">0%</div>";
                }

                var num2 = PipelinList.Where(x => x.ProjectId == pid && x.C1 == "管件法兰").FirstOrDefault();
                if (num2 != null)
                {
-                    gdclHtml += "<span>" + (num2.C7 == "" ? "0%" : num2.C7) + "</span>";
+                    gdclHtml += "<div class=\"th-p\">" + (num2.C7 == "" ? "0%" : num2.C7) + "</div>";
                }
                else
                {
-                    gdclHtml += "<span>0%</span>";
+                    gdclHtml += "<div class=\"th-p\">0%</div>";
                }
                var num3 = PipelinList.Where(x => x.ProjectId == pid && x.C1 == "阀门").FirstOrDefault();
                if (num3 != null)
                {
-                    gdclHtml += "<span>" + (num3.C7 == "" ? "0%" : num3.C7) + "</span>";
+                    gdclHtml += "<div class=\"th-p\">" + (num3.C7 == "" ? "0%" : num3.C7) + "</div>";
                }
                else
                {
-                    gdclHtml += "<span>0%</span>";
+                    gdclHtml += "<div class=\"th-p\">0%</div>";
                }
                var num4 = PipelinList.Where(x => x.ProjectId == pid && x.C1 == "垫片").FirstOrDefault();
                if (num4 != null)
                {
-                    gdclHtml += "<span>" + (num4.C7 == "" ? "0%" : num4.C7) + "</span>";
+                    gdclHtml += "<div class=\"th-p\">" + (num4.C7 == "" ? "0%" : num4.C7) + "</div>";
                }
                else
                {
-                    gdclHtml += "<span>0%</span>";
+                    gdclHtml += "<div class=\"th-p\">0%</div>";
                }
                var num5 = PipelinList.Where(x => x.ProjectId == pid && x.C1 == "紧固件").FirstOrDefault();
                if (num5 != null)
                {
-                    gdclHtml += "<span>" + (num5.C7 == "" ? "0%" : num5.C7) + "</span>";
+                    gdclHtml += "<div class=\"th-p\">" + (num5.C7 == "" ? "0%" : num5.C7) + "</div>";
                }
                else
                {
-                    gdclHtml += "<span>0%</span>";
+                    gdclHtml += "<div class=\"th-p\">0%</div>";
                }
                gdclHtml += " </div>";
                #endregion

                #region 设备材料
-                sbclHtml += " <div class=\"tr\">";
+                sbclHtml += " <div class=\"row\">";
                pname = item.ShortName;
                if (item.ShortName.Length > 5)
                {
                    pname = item.ShortName.Substring(0, 5) + "...";
                }
-                sbclHtml += "<span title=\"" + item.ShortName + "\">" + pname + "</span>";
+                sbclHtml += "<div class=\"th-p\" title=\"" + item.ShortName + "\">" + pname + "</div>";
                //采购量
                var SbcllCglList = SbclList.Where(x => x.ProjectId == pid).ToList();
                double SbcllCgl = 0.0;
@@ -847,17 +888,17 @@ namespace FineUIPro.Web.common
                    }
                }

-                sbclHtml += "<span>" + SbcllCgl + "</span>";
-                sbclHtml += "<span>" + Sbdhs + "</span>";
+                sbclHtml += "<div class=\"th-p\">" + SbcllCgl + "</div>";
+                sbclHtml += "<div class=\"th-p\">" + Sbdhs + "</div>";
                //百分比
                if (SbcllCgl + Sbdhs != 0)
                {
                    var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
-                    sbclHtml += "<span>" + dhbfb + "</span>";
+                    sbclHtml += "<div class=\"th-p\">" + dhbfb + "</div>";
                }
                else
                {
-                    sbclHtml += "<span>0%</span>";
+                    sbclHtml += "<div class=\"th-p\">0%</div>";
                }