添加南岸区第三季度数据

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

@@ -232,9 +232,10 @@ function getAllMarket(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -287,9 +288,10 @@ function getinlandTradeL(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -342,9 +344,10 @@ function getAllConstruction(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -395,9 +398,10 @@ function getAllScale(obj, myChart) {
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].growth;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -536,7 +540,7 @@ function getAllFinancial(data1, myChart) {
 			listdataa += '</tr>'
 		}
 		for (var j = 0; j < data.financial.length; j++) {
-			for (var k = 0; k < data.financial[j].totalNum.length; k++) {
+			for (var k = 0; k < data.financial[j].subData.length; k++) {
 				let a = NoToChinese(Number(k) + 1)
 				str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
 			}
@@ -603,7 +607,7 @@ function getinlandTrade(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -611,6 +615,7 @@ function getinlandTrade(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -676,7 +681,7 @@ function getFinancial(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -684,6 +689,7 @@ function getFinancial(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
@@ -728,7 +734,7 @@ function getFinancial(obj, myChart) {
 		listdataa += '</tr>'
 	
 		for (var j = 0; j < list.length; j++) {
-			if (list[j].subData[0].data.firstThridQuarter) {
+			if (list[j].subData[0].data.firstFourQuarter) {
 				for (var k = 0; k < 4; k++) {
 					let a = NoToChinese(Number(k) + 1)
 					str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
@@ -736,6 +742,7 @@ function getFinancial(obj, myChart) {
 			} else {
 				str += '<th>' + list[j].date + '第一至一季度</th>'
 				str += '<th>' + list[j].date + '第一至二季度</th>'
+				str += '<th>' + list[j].date + '第一至三季度</th>'
 			}
 		}
 
@@ -756,7 +763,7 @@ function getBank(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[1].data.firstThridQuarter) {
+			if (subData[1].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -764,6 +771,7 @@ function getBank(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -830,7 +838,7 @@ function getIndustryByType(obj, myChart) {
 		var xname = ''
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -838,6 +846,7 @@ function getIndustryByType(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
@@ -897,7 +906,7 @@ function getIndustryByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[2].data.firstThridQuarter) {
+		if (subData[2].data.firstFourQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
@@ -905,6 +914,7 @@ function getIndustryByTypeAll(list, obj) {
 		} else {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
+			xdata.push(list[i].date + '年1-3季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -941,7 +951,7 @@ function getScaleByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[1].data.firstThridQuarter) {
+		if (subData[1].data.firstFourQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
@@ -949,6 +959,7 @@ function getScaleByTypeAll(list, obj) {
 		} else {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
+			xdata.push(list[i].date + '年1-3季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -1503,7 +1514,7 @@ function getOtherBar(list, unit) {
 	var dateNum = ['date'];
 
 	for (var i = 0; i < list.length; i++) {
-		if (list[i].subData[0].data.firstThridQuarter) {
+		if (list[i].subData[0].data.firstFourQuarter) {
 			for (var j = 1; j <= 4; j++) {
 				var str = ' ';
 				if (j == 1) {
@@ -1515,7 +1526,7 @@ function getOtherBar(list, unit) {
 				}
 			}
 		} else {
-			for (var j = 1; j <= 2; j++) {
+			for (var j = 1; j <= 3; j++) {
 				var str = ' ';
 				if (j == 1) {
 			str = list[i].date + '年' + ' ' + '第1季度';

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

@@ -236,9 +236,10 @@ function getAllMarket(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -291,9 +292,10 @@ function getinlandTradeL(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -346,9 +348,10 @@ function getAllConstruction(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -399,9 +402,10 @@ function getAllScale(obj, myChart) {
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].growth;
-			if (subData.length == 2) {
+			if (subData.length == 3) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 				array.push(...subData);
 			} else {
 				xdata.push(list[i].date + '年1季度');
@@ -607,7 +611,7 @@ function getinlandTrade(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -615,6 +619,7 @@ function getinlandTrade(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -680,7 +685,7 @@ function getFinancial(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -688,6 +693,7 @@ function getFinancial(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
@@ -732,7 +738,7 @@ function getFinancial(obj, myChart) {
 		listdataa += '</tr>'
 	
 		for (var j = 0; j < list.length; j++) {
-			if (list[j].subData[0].data.firstThridQuarter) {
+			if (list[j].subData[0].data.firstFourQuarter) {
 				for (var k = 0; k < 4; k++) {
 					let a = NoToChinese(Number(k) + 1)
 					str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
@@ -740,6 +746,7 @@ function getFinancial(obj, myChart) {
 			} else {
 				str += '<th>' + list[j].date + '第一至一季度</th>'
 				str += '<th>' + list[j].date + '第一至二季度</th>'
+				str += '<th>' + list[j].date + '第一至三季度</th>'
 			}
 		}
 
@@ -760,7 +767,7 @@ function getBank(obj, myChart) {
 		var xname = '';
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[1].data.firstThridQuarter) {
+			if (subData[1].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -768,6 +775,7 @@ function getBank(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 			for (var j = 0; j < subData.length; j++) {
 				if (obj.data.type == subData[j].type) {
@@ -834,7 +842,7 @@ function getIndustryByType(obj, myChart) {
 		var xname = ''
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].subData;
-			if (subData[2].data.firstThridQuarter) {
+			if (subData[2].data.firstFourQuarter) {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
 				xdata.push(list[i].date + '年1-3季度');
@@ -842,6 +850,7 @@ function getIndustryByType(obj, myChart) {
 			} else {
 				xdata.push(list[i].date + '年1季度');
 				xdata.push(list[i].date + '年1-2季度');
+				xdata.push(list[i].date + '年1-3季度');
 			}
 
 			for (var j = 0; j < subData.length; j++) {
@@ -901,7 +910,7 @@ function getIndustryByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[2].data.firstThridQuarter) {
+		if (subData[2].data.firstFourQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
@@ -909,6 +918,7 @@ function getIndustryByTypeAll(list, obj) {
 		} else {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
+			xdata.push(list[i].date + '年1-3季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -945,7 +955,7 @@ function getScaleByTypeAll(list, obj) {
 	var xdata = [];
 	for (var i = 0; i < list.length; i++) {
 		var subData = list[i].subData;
-		if (subData[1].data.firstThridQuarter) {
+		if (subData[1].data.firstFourQuarter) {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
 			xdata.push(list[i].date + '年1-3季度');
@@ -953,6 +963,7 @@ function getScaleByTypeAll(list, obj) {
 		} else {
 			xdata.push(list[i].date + '年1季度');
 			xdata.push(list[i].date + '年1-2季度');
+			xdata.push(list[i].date + '年1-3季度');
 		}
 		for (var j = 0; j < subData.length; j++) {
 			if (obj.type == subData[j].type) {
@@ -1597,7 +1608,7 @@ function getOtherBar(list, unit) {
 	var dateNum = ['date'];
 
 	for (var i = 0; i < list.length; i++) {
-		if (list[i].subData[0].data.firstThridQuarter) {
+		if (list[i].subData[0].data.firstFourQuarter) {
 			for (var j = 1; j <= 4; j++) {
 				var str = ' ';
 				if (j == 1) {
@@ -1609,7 +1620,7 @@ function getOtherBar(list, unit) {
 				}
 			}
 		} else {
-			for (var j = 1; j <= 2; j++) {
+			for (var j = 1; j <= 3; j++) {
 				var str = ' ';
 				if (j == 1) {
 			str = list[i].date + '年' + ' ' + '第1季度';

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

@@ -69,11 +69,13 @@
 	  "name": "建筑业",
 	  "totalNum": [
 	    "684546.4",
-      "1839054.7"
+        "1839054.7",
+        "3073605.5"
 	  ],
 	  "alloneBasis": [
 	    11.2,
-      11.8
+        11.8,
+        11.8
 	  ]
 	}
   ]

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

@@ -232,7 +232,7 @@
               "totalQuarter": 342949,
               "oneBasis": 7.8
             },
-             "firstThridQuarter": {
+            "firstThridQuarter": {
               "totalQuarter": 450215,
               "oneBasis": 1.4
             },
@@ -254,7 +254,7 @@
               "totalQuarter": 279382,
               "oneBasis": 8.9
             },
-             "firstThridQuarter": {
+            "firstThridQuarter": {
               "totalQuarter": 361080,
               "oneBasis": -0.4
             },
@@ -276,7 +276,7 @@
               "totalQuarter": 710961,
               "oneBasis": 68.1
             },
-             "firstThridQuarter": {
+            "firstThridQuarter": {
               "totalQuarter": 591017,
               "oneBasis": -0.8
             },
@@ -288,53 +288,65 @@
         }
       ]
     },
-	{
-	  "date": "2022",
-	  "name": "地方财政收支",
-	  "subData": [
-	    {
-	      "type": 301,
-	      "subName": "公共财政收入",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 144768,
-	          "oneBasis": 0.4
-	        },
-          "firstSecondQuarter": {
-            "totalQuarter": 287887,
-            "oneBasis": -16.0
+    {
+      "date": "2022",
+      "name": "地方财政收支",
+      "subData": [
+        {
+          "type": 301,
+          "subName": "公共财政收入",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 144768,
+              "oneBasis": 0.4
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 287887,
+              "oneBasis": -16.0
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 388484,
+              "oneBasis": -13.7
+            }
           }
-	      }
-	    },
-	    {
-	      "type": 302,
-	      "subName": "税收收入",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 115456,
-	          "oneBasis": 3.5
-	        },
-          "firstSecondQuarter": {
-            "totalQuarter": 229769,
-            "oneBasis": -17.8
+        },
+        {
+          "type": 302,
+          "subName": "税收收入",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 115456,
+              "oneBasis": 3.5
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 229769,
+              "oneBasis": -17.8
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 298480,
+              "oneBasis": -13.7
+            }
           }
-	      }
-	    },
-	    {
-	      "type": 303,
-	      "subName": "公共财政支出",
-	      "data": {
-	        "firstQuarter": {
-	          "totalQuarter": 196619,
-	          "oneBasis": -9.8
-	        },
-          "firstSecondQuarter": {
-            "totalQuarter": 405226,
-            "oneBasis": 0.2
+        },
+        {
+          "type": 303,
+          "subName": "公共财政支出",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 196619,
+              "oneBasis": -9.8
+            },
+            "firstSecondQuarter": {
+              "totalQuarter": 405226,
+              "oneBasis": 0.2
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 597436,
+              "oneBasis": 1.1
+            }
           }
-	      }
-	    }
-	  ]
-	}
+        }
+      ]
+    }
   ]
 }

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

@@ -93,13 +93,15 @@
 	  "name": "固定资产投资总额增速",
 	  "totalNum": [
 	    "631356",
-      "631356"
+        "631356",
+        "631356"
 	  ],
 	  "alloneBasis": [
 	    12.3,
-      12.3
+        12.3,
+        12.3
 	  ],
-	  "growth":[9.6,4.8]
+	  "growth":[9.6,4.8,2.0]
 	}
   ]
 }

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

@@ -429,10 +429,12 @@
       "name": "社会消费品零售总额",
       "totalNum": [
         "1666411.7",
-        "3351123.3"
+        "3351123.3",
+        "4715409.1"
       ],
       "alloneBasis": [
         0.3,
+        0.1,
         0.1
       ],
       "subData": [

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

@@ -413,15 +413,18 @@
       "name": "地区生产总值",
       "totalNum": [
         "2063315",
-        "4309781"
+        "4309781",
+        "6429200"
       ],
       "alloneBasis": [
         4.1,
-        3.5
+        3.5,
+        1.0
       ],
       "growth": [
         4.1,
-        3.5
+        3.5,
+        1.0
       ],
       "subData": [
         {
@@ -437,6 +440,11 @@
               "totalQuarter": 21766,
               "oneBasis": 0.9,
               "proportion": 0.5
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 31837,
+              "oneBasis": -0.8,
+              "proportion": 0.5
             }
           }
         },
@@ -453,6 +461,11 @@
               "totalQuarter": 1559618,
               "oneBasis": 3.4,
               "proportion": 36.2
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 2341170,
+              "oneBasis": 1.0,
+              "proportion": 36.4
             }
           }
         },
@@ -469,6 +482,11 @@
               "totalQuarter": 2728397,
               "oneBasis": 3.6,
               "proportion": 63.3
+            },
+            "firstThridQuarter": {
+              "totalQuarter": 4056193,
+              "oneBasis": 1.1,
+              "proportion": 63.1
             }
           }
         }

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

@@ -69,11 +69,13 @@
 	  "name": "商品房建设与销售",
 	  "totalNum": [
 	    "37.792",
-      "101.294"
+      "101.294",
+        "121.271"
 	  ],
 	  "alloneBasis": [
 	    -4.5,
-      -9.9
+      -9.9,
+        -20.8
 	  ]
 	}
   ]

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

@@ -93,13 +93,15 @@
       "name": "规模以上工业",
       "totalNum": [
         "2313252.8",
+        "2313252.8",
         "2313252.8"
       ],
       "alloneBasis": [
         59.7,
+        59.7,
         59.7
       ],
-	  "growth":[4.6,3.2]
+	  "growth":[4.6,3.2,0.5]
     }
   ]
 }