修改首页图表

src_0nline/ShwasherSys/ShwasherSys.Application/Common/CommonAppService.cs

@@ -717,9 +717,9 @@ namespace ShwasherSys.Common
 	        DateTime startQuarter = dt.AddMonths(0 - (dt.Month - 1) % 3).AddDays(1 - dt.Day); //本季度初
 	        DateTime endQuarter = startQuarter.AddMonths(3);//.AddDays(-1); //本季度末
 	        string endTime = endQuarter.ToString("yyyy-MM-dd");
-	        var startTime = startQuarter.AddMonths(-12).ToString("yyyy-MM-dd");
+	        var startTime = dt.AddYears(-2).Year + "-01-01";//startQuarter.AddMonths(-21).ToString("yyyy-MM-dd");
 
-	        string sqlStr = "";
+			string sqlStr = "";
 	        if (ct == 1)
 	        {
                 sqlStr = $"select sum(1) as Count,OrderItemStatusId as StatusId,datename(year,TimeCreated) as Year from OrderItems where TimeCreated>='{startYear}' GROUP BY OrderItemStatusId,datename(year,TimeCreated)   HAVING OrderItemStatusId<>{deleteStatus};";

src_0nline/ShwasherSys/ShwasherSys.Web/Views/Home/home.js

@@ -151,7 +151,7 @@ function initCharts() {
 					2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6
 				],
 				itemStyle: {
-					borderRadius:[8,8,0,0]
+					borderRadius:[0,0,0,0]
 				},
 				animation:true
 			},
@@ -195,7 +195,7 @@ function loadOrderStatusChart() {
 			let arrMap = new Map();
 			res.forEach(function (v, i) {
 				//默认年份
-				let ev = qt == "1" ? `${v.year}年-第${v.quarterly}季度` : v.year;
+				let ev = qt == "1" ? `${v.year.substr(2,2)}-Q${v.quarterly}` : v.year;
 				if (!yearArr.some(ele => ele === ev)) {
 					yearArr.push(ev);
 				}
@@ -229,8 +229,10 @@ function loadOrderStatusChart() {
 			option1.legend.data = ["未完成订单明细", "完成订单明细"];
 			option1.series[0].data = notOrderArr;
 			option1.series[0].name = "未完成订单明细";
+			option1.series[0].stack = 'one';
 			option1.series[1].data = orderArr;
 			option1.series[1].name = "完成订单明细";
+			option1.series[1].stack = 'one';
 			orderStatusChart.setOption(option1);
 		}
 	});
@@ -251,7 +253,7 @@ function loadProductionStatusChart() {
 			let arrMap = new Map();
 			res.forEach(function (v, i) {
 				//默认年份
-				let ev = qt == "1" ? `${v.year}年-第${v.quarterly}季度` : v.year;
+				let ev = qt == "1" ? `${v.year.substr(2, 2)}-Q${v.quarterly}` : v.year;
 				if (!yearArr.some(ele => ele === ev)) {
 					yearArr.push(ev);
 				}
@@ -284,8 +286,10 @@ function loadProductionStatusChart() {
 			option2.yAxis[0].interval = qt == "1"?500: 1000;
 			option2.legend.data = ["未完成排产单", "已入库/已完成的排产单"];
 			option2.series[0].data = notStoreArr;
+			option2.series[0].stack = 'one';
 			option2.series[0].name = "未完成排产单";
 			option2.series[1].data = storeArr;
+			option2.series[1].stack = 'one';
 			option2.series[1].name = "已入库/已完成的排产单";
 			productionStatusChart.setOption(option2);
 		}

src_0nline/ShwasherSys/ShwasherSys.Web/Web.config

@@ -9,8 +9,8 @@
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <connectionStrings>
-    <add name="Default" connectionString="Server=localhost; Database=DBwasher2020; User Id=sa;Password=123456" providerName="System.Data.SqlClient" />
-    <!--<add name="Default" connectionString="Server=101.132.184.49; Database=DBwasher2020; User Id=sa;Password=Iwb2017;MultipleActiveResultSets=true;"  providerName="System.Data.SqlClient" />-->
+    <!--<add name="Default" connectionString="Server=localhost; Database=DBwasher2020; User Id=sa;Password=123456" providerName="System.Data.SqlClient" />-->
+    <add name="Default" connectionString="Server=101.132.184.49; Database=DBwasher2020; User Id=sa;Password=Iwb2017;MultipleActiveResultSets=true;"  providerName="System.Data.SqlClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />