更新2023第一季度的南岸大屏数据

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

@@ -232,10 +232,8 @@ function getAllMarket(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -288,10 +286,8 @@ function getinlandTradeL(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -344,10 +340,8 @@ function getAllConstruction(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -398,10 +392,8 @@ function getAllScale(obj, myChart) {
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].growth;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -614,8 +606,6 @@ function getinlandTrade(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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) {
@@ -688,8 +678,6 @@ function getFinancial(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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++) {
@@ -741,8 +729,6 @@ function getFinancial(obj, myChart) {
 				}
 			} else {
 				str += '<th>' + list[j].date + '第一至一季度</th>'
-				str += '<th>' + list[j].date + '第一至二季度</th>'
-				str += '<th>' + list[j].date + '第一至三季度</th>'
 			}
 		}
 
@@ -770,8 +756,6 @@ function getBank(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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) {
@@ -845,8 +829,6 @@ function getIndustryByType(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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++) {
@@ -913,8 +895,6 @@ function getIndustryByTypeAll(list, obj) {
 			xdata.push(list[i].date + '年1-4季度');
 		} 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) {
@@ -958,8 +938,6 @@ function getScaleByTypeAll(list, obj) {
 			xdata.push(list[i].date + '年1-4季度');
 		} 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) {
@@ -1526,16 +1504,18 @@ function getOtherBar(list, unit) {
 				}
 			}
 		} else {
-			for (var j = 1; j <= 3; j++) {
-				var str = ' ';
-				if (j == 1) {
 			str = list[i].date + '年' + ' ' + '第1季度';
 			dateNum.push(str);
-				} else {
-					str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
-					dateNum.push(str);
-				}
-			}
+			// for (var j = 1; j <= 3; j++) {
+			// 	var str = ' ';
+			// 	if (j == 1) {
+			// str = list[i].date + '年' + ' ' + '第1季度';
+			// dateNum.push(str);
+			// 	} else {
+			// 		str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
+			// 		dateNum.push(str);
+			// 	}
+			// }
 		}
 
 

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

@@ -236,10 +236,8 @@ function getAllMarket(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -292,10 +290,8 @@ function getinlandTradeL(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -348,10 +344,8 @@ function getAllConstruction(obj, myChart) {
 		for (var i = 0; i < list.length; i++) {
 
 			var subData = list[i].totalNum;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -402,10 +396,8 @@ function getAllScale(obj, myChart) {
 		var xdata = [];
 		for (var i = 0; i < list.length; i++) {
 			var subData = list[i].growth;
-			if (subData.length == 3) {
+			if (subData.length == 1) {
 				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季度');
@@ -618,8 +610,6 @@ function getinlandTrade(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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) {
@@ -692,8 +682,6 @@ function getFinancial(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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++) {
@@ -745,8 +733,6 @@ function getFinancial(obj, myChart) {
 				}
 			} else {
 				str += '<th>' + list[j].date + '第一至一季度</th>'
-				str += '<th>' + list[j].date + '第一至二季度</th>'
-				str += '<th>' + list[j].date + '第一至三季度</th>'
 			}
 		}
 
@@ -774,8 +760,6 @@ function getBank(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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) {
@@ -849,8 +833,6 @@ function getIndustryByType(obj, myChart) {
 				xdata.push(list[i].date + '年1-4季度');
 			} 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++) {
@@ -917,8 +899,6 @@ function getIndustryByTypeAll(list, obj) {
 			xdata.push(list[i].date + '年1-4季度');
 		} 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) {
@@ -962,8 +942,6 @@ function getScaleByTypeAll(list, obj) {
 			xdata.push(list[i].date + '年1-4季度');
 		} 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) {
@@ -1619,16 +1597,18 @@ function getOtherBar(list, unit) {
 				}
 			}
 		} else {
-			for (var j = 1; j <= 3; j++) {
-				var str = ' ';
-				if (j == 1) {
 			str = list[i].date + '年' + ' ' + '第1季度';
 			dateNum.push(str);
-				} else {
-					str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
-					dateNum.push(str);
-				}
-			}
+			// for (var j = 1; j <= 3; j++) {
+			// 	var str = ' ';
+			// 	if (j == 1) {
+			// str = list[i].date + '年' + ' ' + '第1季度';
+			// dateNum.push(str);
+			// 	} else {
+			// 		str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
+			// 		dateNum.push(str);
+			// 	}
+			// }
 		}
 
 

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

@@ -79,6 +79,16 @@
         11.8,
         5.8
 	  ]
-	}
+	},
+    {
+      "date": "2023",
+      "name": "建筑业",
+      "totalNum": [
+        "717044.7"
+      ],
+      "alloneBasis": [
+        11.5
+      ]
+    }
   ]
 }

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

@@ -359,6 +359,42 @@
           }
         }
       ]
+    },
+    {
+      "date": "2023",
+      "name": "地方财政收支",
+      "subData": [
+        {
+          "type": 301,
+          "subName": "公共财政收入",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 142532,
+              "oneBasis": -1.5
+            }
+          }
+        },
+        {
+          "type": 302,
+          "subName": "税收收入",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 111586,
+              "oneBasis": -3.4
+            }
+          }
+        },
+        {
+          "type": 303,
+          "subName": "公共财政支出",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 196063,
+              "oneBasis": -0.3
+            }
+          }
+        }
+      ]
     }
   ]
 }

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

@@ -104,6 +104,17 @@
         12.3
 	  ],
 	  "growth":[9.6,4.8,2.0,-3.8]
-	}
+	},
+    {
+      "date": "2023",
+      "name": "固定资产投资总额增速",
+      "totalNum": [
+        "631356"
+      ],
+      "alloneBasis": [
+        12.3
+      ],
+      "growth":[17.5]
+    }
   ]
 }

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

@@ -529,6 +529,58 @@
           }
         }
       ]
+    },
+    {
+      "date": "2023",
+      "name": "社会消费品零售总额",
+      "totalNum": [
+        "1741563.0"
+      ],
+      "alloneBasis": [
+        4.5
+      ],
+      "subData": [
+        {
+          "type": 201,
+          "subName": "批发业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 3003678.3,
+              "oneBasis": 12.7
+            }
+          }
+        },
+        {
+          "type": 202,
+          "subName": "零售业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 1004087.7,
+              "oneBasis": 8.1
+            }
+          }
+        },
+        {
+          "type": 203,
+          "subName": "住宿业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 41517.5,
+              "oneBasis": 27.5
+            }
+          }
+        },
+        {
+          "type": 204,
+          "subName": "餐饮业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 116395.1,
+              "oneBasis": 16.7
+            }
+          }
+        }
+      ]
     }
   ]
 }

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

@@ -509,6 +509,54 @@
           }
         }
       ]
+    },
+    {
+      "date": "2023",
+      "name": "地区生产总值",
+      "totalNum": [
+        "2311803"
+      ],
+      "alloneBasis": [
+        4.8
+      ],
+      "growth": [
+        4.8
+      ],
+      "subData": [
+        {
+          "type": 101,
+          "subName": "第一产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 9881,
+              "oneBasis": 3.8,
+              "proportion": 0.4
+            }
+          }
+        },
+        {
+          "type": 102,
+          "subName": "第二产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 751326,
+              "oneBasis": 6.5,
+              "proportion": 32.5
+            }
+          }
+        },
+        {
+          "type": 103,
+          "subName": "第三产业",
+          "data": {
+            "firstQuarter": {
+              "totalQuarter": 1550596,
+              "oneBasis": 4.1,
+              "proportion": 67.1
+            }
+          }
+        }
+      ]
     }
   ]
 }

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

@@ -79,6 +79,16 @@
         -20.8,
         -36.1
 	  ]
-	}
+	},
+    {
+      "date": "2023",
+      "name": "商品房建设与销售",
+      "totalNum": [
+        "38.6633"
+      ],
+      "alloneBasis": [
+        2.3
+      ]
+    }
   ]
 }

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

@@ -104,6 +104,17 @@
         59.7
       ],
 	  "growth":[4.6,3.2,0.5,-0.4]
+    },
+    {
+      "date": "2023",
+      "name": "规模以上工业",
+      "totalNum": [
+        "2313252.8"
+      ],
+      "alloneBasis": [
+        59.7
+      ],
+      "growth":[4.5]
     }
   ]
 }