更新2022第二季度数据

nngkxxdp/src/main/resources/static/natj/js/enterStatisMain.js

@@ -225,9 +225,9 @@ function getAllMarket(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			// console.log(subData);
-			if (subData.length == 1) {
+			if (subData.length == 2) {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -275,15 +275,14 @@ function getinlandTradeL(obj, myChart) {
 	var str, listdataa;
 	getData('./json/inlandTrade.json').then(data => {
 		var list = data.trade;
-console.log(data)
 		var array = [];
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			// console.log(subData);
-			if (subData.length == 1) {
+			if (subData.length == 2) {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -315,7 +314,6 @@ console.log(data)
 		}
 		listdataa += '</tr>'
 		for (var j = 0; j < list.length; j++) {
-			console.log(list[j])
 			for (var k = 0; k < list[j].totalNum.length; k++) {
 				let a = NoToChinese(Number(k) + 1)
 				str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
@@ -337,8 +335,9 @@ function getAllConstruction(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 1) {
+			if (subData.length == 2) {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -389,8 +388,9 @@ function getAllScale(obj, myChart) {
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].growth;
-			if (subData.length == 1) {
+			if (subData.length == 2) {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -528,18 +528,25 @@ function getAllFinancial(data1, myChart) {
 			}
 			listdataa += '</tr>'
 		}
-
 		for (var j = 0; j < data.financial.length; j++) {
-			if (data.financial[j].subData[0].data.firstSecondQuarter) {
-				for (var k = 0; k < 4; k++) {
-					let a = NoToChinese(Number(k) + 1)
-					str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
-				}
-			} else {
-				str += '<th>' + data.financial[j].date + '第一至一季度</th>'
+			for (var k = 0; k < data.financial[j].totalNum.length; k++) {
+				let a = NoToChinese(Number(k) + 1)
+				str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
 			}
 
 		}
+
+		// for (var j = 0; j < data.financial.length; j++) {
+		// 	if (data.financial[j].subData[0].data.firstThridQuarter) {
+		// 		for (var k = 0; k < 4; k++) {
+		// 			let a = NoToChinese(Number(k) + 1)
+		// 			str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
+		// 		}
+		// 	} else {
+		// 		str += '<th>' + data.financial[j].date + '第一至一季度</th>'
+		// 	}
+
+		// }
 		$('.tableTit').append(str);
 		$('.tableMain').append(listdataa);
 
@@ -589,13 +596,14 @@ function getinlandTrade(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstSecondQuarter) {
+			if (subData[2].data.firstThridQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
 				xdata.push(list[i].date + '年1-4季度');
 			} else {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -661,20 +669,20 @@ function getFinancial(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstSecondQuarter) {
+			if (subData[2].data.firstThridQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
 				xdata.push(list[i].date + '年1-4季度');
 			} else {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
 					xname = subData[j].subName
 					var ndata = subData[j].data;
-					console.log(ndata.firstQuarter)
 					array.push(ndata.firstQuarter.totalQuarter ?
 						ndata.firstQuarter.totalQuarter : 0);
 					if (ndata.firstSecondQuarter) {
@@ -711,14 +719,16 @@ function getFinancial(obj, myChart) {
 			listdataa += '<td>' + array[j] + '万元' + '</td>';
 		}
 		listdataa += '</tr>'
+	
 		for (var j = 0; j < list.length; j++) {
-			if (list[j].subData[0].data.firstSecondQuarter) {
+			if (list[j].subData[0].data.firstThridQuarter) {
 				for (var k = 0; k < 4; k++) {
 					let a = NoToChinese(Number(k) + 1)
 					str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
 				}
 			} else {
 				str += '<th>' + list[j].date + '第一至一季度</th>'
+				str += '<th>' + list[j].date + '第一至二季度</th>'
 			}
 		}
 
@@ -739,13 +749,14 @@ function getBank(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[1].data.firstSecondQuarter) {
+			if (subData[1].data.firstThridQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
 				xdata.push(list[i].date + '年1-4季度');
 			} else {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -812,13 +823,14 @@ function getIndustryByType(obj, myChart) {
 		var xname = ''
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstSecondQuarter) {
+			if (subData[2].data.firstThridQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
 				xdata.push(list[i].date + '年1-4季度');
 			} else {
 				xdata.push(list[i].date + '年1季度');
+				xdata.push(list[i].date + '年1-2季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
@@ -878,13 +890,14 @@ function getIndustryByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[2].data.firstSecondQuarter) {
+		if (subData[2].data.firstThridQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
 			xdata.push(list[i].date + '年1-4季度');
 		} else {
 			xdata.push(list[i].date + '年1季度');
+			xdata.push(list[i].date + '年1-2季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -921,13 +934,14 @@ function getScaleByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[1].data.firstSecondQuarter) {
+		if (subData[1].data.firstThridQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
 			xdata.push(list[i].date + '年1-4季度');
 		} else {
 			xdata.push(list[i].date + '年1季度');
+			xdata.push(list[i].date + '年1-2季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -1024,7 +1038,6 @@ getData('./json/bank.json').then(data => {
 
 	$(".togglePic2").click(function () {
 		var newKey = $(this).html();
-		// console.log(newKey);
 		var optionBank = getOption(newKey);
 		myChartConstructionBank.clear();
 		myChartConstructionBank.setOption(optionBank);
@@ -1037,8 +1050,6 @@ function getBar(list, unit) {
 	var alloneBasis = [];
 	var allData = ['季度'];
 	for (var i = 0; i < list.length; i++) {
-		// dateNum.push(list[i].date);
-		// console.log(list[i].totalNum);
 		for (var j = 1; j <= list[i].totalNum.length; j++) {
 			var str = ' ';
 			if (j == 1) {
@@ -1072,7 +1083,6 @@ function getBar(list, unit) {
 			trigger: 'item',
 
 			formatter: function (params) {
-				// console.log(params);
 				var htmlStr = '';
 				var color = params.color; //图例颜色
 				var seriesName = params.seriesName; //图例名称
@@ -1087,7 +1097,6 @@ function getBar(list, unit) {
 				htmlStr += xName;
 				htmlStr += '</span>';
 				htmlStr += "<span style='min-height: 20pt; font-size: 10pt; margin-left: 20px'>";
-				// console.log(params.data.length);
 				if (!value.length) {
 					htmlStr += value + '%';
 				} else {
@@ -1235,7 +1244,6 @@ function getBarl(list, unit) {
 		}
 
 		var growthList = list[i].growth;
-		// console.log(list[i].growth)
 		if (list[i].growth) {
 			for (var n = 0; n < growthList.length; n++) {
 				growth.push(growthList[n]);
@@ -1245,7 +1253,6 @@ function getBarl(list, unit) {
 
 	};
 	var sourceData = [dateNum, alloneBasis];
-	// console.log(sourceData[0])
 
 	return {
 		legend: {},
@@ -1259,7 +1266,6 @@ function getBarl(list, unit) {
 			trigger: 'item',
 
 			formatter: function (params) {
-				// console.log(params);
 				var htmlStr = '';
 				var color = params.color; //图例颜色
 				var seriesName = params.seriesName; //图例名称
@@ -1274,7 +1280,6 @@ function getBarl(list, unit) {
 				htmlStr += xName;
 				htmlStr += '</span>';
 				htmlStr += "<span style='min-height: 20pt; font-size: 10pt; margin-left: 20px'>";
-				// console.log(params.data.length);
 				if (!value.length) {
 					htmlStr += value + '%';
 				} else {
@@ -1375,7 +1380,6 @@ function getBarg(list, unit) {
 		}
 
 		var growthList = list[i].growth;
-		// console.log(list[i].growth)
 		if (list[i].growth) {
 			for (var n = 0; n < growthList.length; n++) {
 				growth.push(growthList[n]);
@@ -1385,7 +1389,6 @@ function getBarg(list, unit) {
 
 	};
 	var sourceData = [dateNum, alloneBasis];
-	// console.log(sourceData[0])
 
 	return {
 		legend: {},
@@ -1493,7 +1496,7 @@ function getOtherBar(list, unit) {
 	var dateNum = ['date'];
 
 	for (var i = 0; i < list.length; i++) {
-		if (list[i].subData[0].data.firstSecondQuarter) {
+		if (list[i].subData[0].data.firstThridQuarter) {
 			for (var j = 1; j <= 4; j++) {
 				var str = ' ';
 				if (j == 1) {
@@ -1505,16 +1508,16 @@ function getOtherBar(list, unit) {
 				}
 			}
 		} else {
-			// for (var j = 1; j <= 2; j++) {
-			// 	var str = ' ';
-			// 	if (j == 1) {
+			for (var j = 1; j <= 2; j++) {
+				var str = ' ';
+				if (j == 1) {
 			str = list[i].date + '年' + ' ' + '第1季度';
 			dateNum.push(str);
-			// 	} else {
-			// 		str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
-			// 		dateNum.push(str);
-			// 	}
-			// }
+				} else {
+					str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
+					dateNum.push(str);
+				}
+			}
 		}
 
 
@@ -1573,7 +1576,6 @@ function getOtherBar(list, unit) {
 			}
 		}
 		var sourceData = [dateNum, quarter3];
-		// console.log(k,quarter3);
 
 		return {
 			legend: {},
@@ -1586,7 +1588,6 @@ function getOtherBar(list, unit) {
 			tooltip: {
 				trigger: 'item',
 				formatter: function (params) {
-					// console.log(params);
 					var htmlStr = '';
 					var color = params.color; //图例颜色
 					var seriesName = params.seriesName; //图例名称
@@ -1601,7 +1602,6 @@ function getOtherBar(list, unit) {
 					htmlStr += xName;
 					htmlStr += '</span>';
 					htmlStr += "<span style='min-height: 20pt; font-size: 10pt; margin-left: 20px'>";
-					// console.log(params.data.length);
 					if (!value.length) {
 						htmlStr += value + '%';
 					} else {

nngkxxdp/src/main/resources/static/natj/json/construction.json

@@ -68,10 +68,12 @@
 	  "date": "2022",
 	  "name": "建筑业",
 	  "totalNum": [
-	    "684546.4"
+	    "684546.4",
+      "1839054.7"
 	  ],
 	  "alloneBasis": [
-	    11.2
+	    11.2,
+      11.8
 	  ]
 	}
   ]

nngkxxdp/src/main/resources/static/natj/json/financial.json

@@ -299,7 +299,11 @@
 	        "firstQuarter": {
 	          "totalQuarter": 144768,
 	          "oneBasis": 0.4
-	        }
+	        },
+          "firstSecondQuarter": {
+            "totalQuarter": 287887,
+            "oneBasis": -16.0
+          }
 	      }
 	    },
 	    {
@@ -309,7 +313,11 @@
 	        "firstQuarter": {
 	          "totalQuarter": 115456,
 	          "oneBasis": 3.5
-	        }
+	        },
+          "firstSecondQuarter": {
+            "totalQuarter": 229769,
+            "oneBasis": -17.8
+          }
 	      }
 	    },
 	    {
@@ -319,7 +327,11 @@
 	        "firstQuarter": {
 	          "totalQuarter": 196619,
 	          "oneBasis": -9.8
-	        }
+	        },
+          "firstSecondQuarter": {
+            "totalQuarter": 405226,
+            "oneBasis": 0.2
+          }
 	      }
 	    }
 	  ]

nngkxxdp/src/main/resources/static/natj/json/fixedAssets.json

@@ -92,12 +92,14 @@
 	  "date": "2022",
 	  "name": "固定资产投资总额增速",
 	  "totalNum": [
-	    "631356"
+	    "631356",
+      "631356"
 	  ],
 	  "alloneBasis": [
-	    12.3
+	    12.3,
+      12.3
 	  ],
-	  "growth":[9.6]
+	  "growth":[9.6,4.8]
 	}
   ]
 }

nngkxxdp/src/main/resources/static/natj/json/inlandTrade.json

@@ -330,8 +330,8 @@
       "alloneBasis": [
         41.0,
         27.1,
-       	18.9,
-       	13.0
+        18.9,
+        13.0
       ],
       "subData": [
         {
@@ -424,57 +424,75 @@
         }
       ]
     },
-	{
-	  "date": "2022",
-	  "name": "社会消费品零售总额",
-	  "totalNum": [
-		"1666411.7"
-	  ],
-	  "alloneBasis": [
-		0.3
-	  ],
-	  "subData": [
-		{
-		  "type": 201,
-		  "subName": "批发业",
-		  "data": {
-			"firstQuarter": {
-			  "totalQuarter": 2665386.1,
-			  "oneBasis": -9.8
-			}
-		  }
-		},
-		{
-		  "type": 202,
-		  "subName": "零售业",
-		  "data": {
-			"firstQuarter": {
-			  "totalQuarter": 928543.8,
-			  "oneBasis": 3.8
-			}
-		  }
-		},
-		{
-		  "type": 203,
-		  "subName": "住宿业",
-		  "data": {
-			"firstQuarter": {
-			  "totalQuarter": 32562,
-			  "oneBasis": -3.2
-			}
-		  }
-		},
-		{
-		  "type": 204,
-		  "subName": "餐饮业",
-		  "data": {
-			"firstQuarter": {
-			  "totalQuarter": 99759.8,
-			  "oneBasis": 2.1
-			}
-		  }
-		}
-	  ]
-	}
+    {
+      "date": "2022",
+      "name": "社会消费品零售总额",
+      "totalNum": [
+        "1666411.7",
+        "335.1"
+      ],
+      "alloneBasis": [
+        0.3,
+        0.1
+      ],
+      "subData": [
+        {
+          "type": 201,
+          "subName": "批发业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 2665386.1,
+              "oneBasis": -9.8
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 252124.2,
+              "oneBasis": 54.7
+            }
+          }
+        },
+        {
+          "type": 202,
+          "subName": "零售业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 928543.8,
+              "oneBasis": 3.8
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 252124.2,
+              "oneBasis": 54.7
+            }
+          }
+        },
+        {
+          "type": 203,
+          "subName": "住宿业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 32562,
+              "oneBasis": -3.2
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 252124.2,
+              "oneBasis": 54.7
+            }
+          }
+        },
+        {
+          "type": 204,
+          "subName": "餐饮业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 99759.8,
+              "oneBasis": 2.1
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 252124.2,
+              "oneBasis": 54.7
+            }
+          }
+        }
+      ]
+    }
   ]
 }

nngkxxdp/src/main/resources/static/natj/json/jdp.json

@@ -15,12 +15,12 @@
         2,
         2.9
       ],
-	  "growth": [
-	    -9.9,
-	    0.2,
-	    2,
-	    2.9
-	  ],
+      "growth": [
+        -9.9,
+        0.2,
+        2,
+        2.9
+      ],
       "subData": [
         {
           "type": 101,
@@ -117,12 +117,12 @@
         5.7,
         6.1
       ],
-	  "growth": [
-	    7.5,
-	    5.6,
-	    5.7,
-	    6.1
-	  ],
+      "growth": [
+        7.5,
+        5.6,
+        5.7,
+        6.1
+      ],
       "subData": [
         {
           "type": 101,
@@ -219,12 +219,12 @@
         2.0,
         3.5
       ],
-	  "growth": [
-	    -7.8,
-	    0,
-	    2.0,
-	    3.5
-	  ],
+      "growth": [
+        -7.8,
+        0,
+        2.0,
+        3.5
+      ],
       "subData": [
         {
           "type": 101,
@@ -321,12 +321,12 @@
         10,
         6.2
       ],
-	  "growth": [
-	    18.5,
-	    12.8,
-	    10,
-	    6.2
-	  ],
+      "growth": [
+        18.5,
+        12.8,
+        10,
+        6.2
+      ],
       "subData": [
         {
           "type": 101,
@@ -408,51 +408,71 @@
         }
       ]
     },
-	{
-	  "date": "2022",
-	  "name": "地区生产总值",
-	  "totalNum": [
-	    "2063315"
-	  ],
-	  "alloneBasis": [
-	    4.1
-	  ],
-	  "growth":[4.1],
-	  "subData": [
-	    {
-	      "type": 101,
-	      "subName": "第一产业",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 8646,
-	          "oneBasis": -0.4,
-	          "proportion": 0.4
-	        }
-	      }
-	    },
-	    {
-	      "type": 102,
-	      "subName": "第二产业",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 667514,
-	          "oneBasis": 3.9,
-	          "proportion": 32.4
-	        }
-	      }
-	    },
-	    {
-	      "type": 103,
-	      "subName": "第三产业",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 1387155,
-	          "oneBasis": 4.2,
-	          "proportion": 67.2
-	        }
-	      }
-	    }
-	  ]
-	}
+    {
+      "date": "2022",
+      "name": "地区生产总值",
+      "totalNum": [
+        "2063315",
+        "4309781"
+      ],
+      "alloneBasis": [
+        4.1,
+        3.5
+      ],
+      "growth": [
+        4.1,
+        3.5
+      ],
+      "subData": [
+        {
+          "type": 101,
+          "subName": "第一产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 8646,
+              "oneBasis": -0.4,
+              "proportion": 0.4
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 21766,
+              "oneBasis": 0.9,
+              "proportion": 0.5
+            }
+          }
+        },
+        {
+          "type": 102,
+          "subName": "第二产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 667514,
+              "oneBasis": 3.9,
+              "proportion": 32.4
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 1559618,
+              "oneBasis": 3.4,
+              "proportion": 36.2
+            }
+          }
+        },
+        {
+          "type": 103,
+          "subName": "第三产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 1387155,
+              "oneBasis": 4.2,
+              "proportion": 67.2
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 2728397,
+              "oneBasis": 3.6,
+              "proportion": 63.3
+            }
+          }
+        }
+      ]
+    }
   ]
-}
+}

nngkxxdp/src/main/resources/static/natj/json/realtyMarket.json

@@ -68,10 +68,12 @@
 	  "date": "2022",
 	  "name": "商品房建设与销售",
 	  "totalNum": [
-	    "37.792"
+	    "37.792",
+      "101.294"
 	  ],
 	  "alloneBasis": [
-	    -4.5
+	    -4.5,
+      -9.9
 	  ]
 	}
   ]

nngkxxdp/src/main/resources/static/natj/json/scale.json

@@ -92,12 +92,14 @@
       "date": "2022",
       "name": "规模以上工业",
       "totalNum": [
+        "2313252.8",
         "2313252.8"
       ],
       "alloneBasis": [
+        59.7,
         59.7
       ],
-	  "growth":[4.6]
+	  "growth":[4.6,3.2]
     }
   ]
 }