提交代码

SGGL/FineUIPro.Web/Door/InOutRecordChart.aspx

@@ -265,7 +265,7 @@
                             <div class="tab" data-value="4">
                                 <div class="t-item active">人员类型</div>
                                 <div class="spline"></div>
-                                <div class="t-item">专业</div>
+                                <%--<div class="t-item">专业</div>--%>
                             </div>
                         </div>
                         <div class="bw-item-content">
@@ -320,6 +320,28 @@
                     interval: 0,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
+                    },
+                    formatter: function (value) {
+                        var ret = "";//拼接加\n返回的类目项  
+                        var maxLength = 2;//每项显示文字个数  
+                        var valLength = value.length;//X轴类目项的文字个数  
+                        var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
+                        if (rowN > 1)//如果类目项的文字大于maxLength,  
+                        {
+                            for (var i = 0; i < rowN; i++) {
+                                var temp = "";//每次截取的字符串  
+                                var start = i * maxLength;//开始截取的位置  
+                                var end = start + maxLength;//结束截取的位置  
+                                //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
+                                //temp = value.substring(start, end) + "\n";  
+                                temp = value.substring(start, end) + (i == rowN - 1 ? "" : "\n");
+                                ret += temp; //凭借最终的字符串  
+                            }
+                            return ret;
+                        }
+                        else {
+                            return value;
+                        }
                     }
                 },
                 type: 'category',

SGGL/FineUIPro.Web/Door/InOutRecordChart.aspx.cs

@@ -32,7 +32,7 @@ namespace FineUIPro.Web.Door
                 List<string> listCategories = new List<string>();
                 Model.SingleSerie s1 = new Model.SingleSerie();
                 List<double> listdata1 = new List<double>();
-                DateTime startDate = Convert.ToDateTime(DateTime.Now.Date.Year + '-' + DateTime.Now.Date.Month + "-1");
+                DateTime startDate = Convert.ToDateTime(DateTime.Now.Date.Year.ToString() + '-' + DateTime.Now.Date.Month.ToString() + "-1");
                 DateTime endDate = startDate.AddMonths(1);
                 var totalList = (from x in Funs.DB.T_d_EmployInOutRecord
                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate >= startDate && x.RecordDate < endDate