修改南岸区新需求样式和数据显示

nngkxxdp/src/main/resources/static/natj/enter_dataAll.html

@@ -64,9 +64,9 @@
 								<li lay-id="constructionmain" style="width: 100px;">建筑业总产值</li>
 								<li lay-id="fixedAssetsmain" style="width: 120px;">固定资产投资总额</li>
 								<li lay-id="realtyMarketmain" style="width: 120px;">商品房建设与销售</li>
-								<li lay-id="inlandTrademain" style="width: 120px;">批发零售住宿餐饮业</li>
+								<li lay-id="inlandTrademain" style="width: 120px;">社会消费品零售总额</li>
 								<li lay-id="publicIncomemain" style="width: 100px;">地方财政收支</li>
-								<li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li>
+								<!-- <li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li> -->
 							</ul>
 							<div class="layui-tab-content" style="height: 500px;">
 								<div class="layui-tab-item layui-show" id="gdpmain"
@@ -95,7 +95,7 @@
 									</div>
 									<div id="publicIncomemain" style="height: 480px;width: 1200px;"></div>
 								</div>
-								<div class="layui-tab-item" style="position: relative;">
+								<!-- <div class="layui-tab-item" style="position: relative;">
 									<div class="czbtn">
 										<div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币存款余额
 										</div>
@@ -104,7 +104,7 @@
 									</div>
 									<div id="bankmain" style="height: 480px;width: 1200px;"></div>
 
-								</div>
+								</div> -->
 							</div>
 						</div>
 

nngkxxdp/src/main/resources/static/natj/enter_showStatis.html

@@ -341,9 +341,9 @@
 							<li lay-id="constructionmain" style="width: 100px;">建筑业总产值</li>
 							<li lay-id="fixedAssetsmain" style="width: 120px;">固定资产投资总额</li>
 							<li lay-id="realtyMarketmain" style="width: 120px;">商品房建设与销售</li>
-							<li lay-id="inlandTrademain" style="width: 120px;">批发零售住宿餐饮业</li>
+							<li lay-id="inlandTrademain" style="width: 120px;">社会消费品零售总额</li>
 							<li lay-id="publicIncomemain" style="width: 100px;">地方财政收支</li>
-							<li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li>
+							<!-- <li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li> -->
 						</ul>
 						<div class="layui-tab-content" style="height: 400px;">
 							<div class="layui-tab-item layui-show" id="gdpmain" style="height: 400px;width: 1146px;">
@@ -365,20 +365,20 @@
 							</div>
 							<div class="layui-tab-item" style="position: relative;">
 								<div class="czbtn">
-									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政支出</div>
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">公共财政收入</div>
 									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">税收收入</div>
-									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政收入</div>
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">公共财政支出</div>
 								</div>
 								<div id="publicIncomemain" style="height: 400px;width: 1146px;"></div>
 							</div>
-							<div class="layui-tab-item" style="position: relative;">
+							<!-- <div class="layui-tab-item" style="position: relative;">
 								<div class="czbtn">
 									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币存款余额</div>
 									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币贷款余额</div>
 								</div>
 								<div id="bankmain" style="height: 400px;width: 1146px;"></div>
 
-							</div>
+							</div> -->
 						</div>
 					</div>
 

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

@@ -6,7 +6,7 @@
       "subData": [
         {
           "type": 301,
-          "subName": "＃公共财政收入",
+          "subName": "公共财政收入",
           "data": {
             "firstQuarter": {
               "totalQuarter": 124608,
@@ -50,7 +50,7 @@
         },
         {
           "type": 303,
-          "subName": "＃公共财政支出",
+          "subName": "公共财政支出",
           "data": {
             "firstQuarter": {
               "totalQuarter": 155001,
@@ -78,7 +78,7 @@
       "subData": [
         {
           "type": 301,
-          "subName": "＃公共财政收入",
+          "subName": "公共财政收入",
           "data": {
             "firstQuarter": {
               "totalQuarter": 128399,
@@ -122,7 +122,7 @@
         },
         {
           "type": 303,
-          "subName": "＃公共财政支出",
+          "subName": "公共财政支出",
           "data": {
             "firstQuarter": {
               "totalQuarter": 165463,
@@ -150,7 +150,7 @@
       "subData": [
         {
           "type": 301,
-          "subName": "＃公共财政收入",
+          "subName": "公共财政收入",
           "data": {
             "firstQuarter": {
               "totalQuarter": 103157,
@@ -194,7 +194,7 @@
         },
         {
           "type": 303,
-          "subName": "＃公共财政支出",
+          "subName": "公共财政支出",
           "data": {
             "firstQuarter": {
               "totalQuarter": 174831,
@@ -222,7 +222,7 @@
       "subData": [
         {
           "type": 301,
-          "subName": "＃公共财政收入",
+          "subName": "公共财政收入",
           "data": {
             "firstQuarter": {
               "totalQuarter": 144286,
@@ -266,7 +266,7 @@
         },
         {
           "type": 303,
-          "subName": "＃公共财政支出",
+          "subName": "公共财政支出",
           "data": {
             "firstQuarter": {
               "totalQuarter": 265732,
@@ -294,7 +294,7 @@
 	  "subData": [
 	    {
 	      "type": 301,
-	      "subName": "＃公共财政收入",
+	      "subName": "公共财政收入",
 	      "data": {
 	        "firstQuarter": {
 	          "totalQuarter": 144768,
@@ -314,7 +314,7 @@
 	    },
 	    {
 	      "type": 303,
-	      "subName": "＃公共财政支出",
+	      "subName": "公共财政支出",
 	      "data": {
 	        "firstQuarter": {
 	          "totalQuarter": 196619,

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

@@ -2,7 +2,7 @@
   "trade": [
     {
       "date": "2018",
-      "name": "社会消费品零售",
+      "name": "社会消费品零售总额总额",
       "totalNum": [
         "1147896",
         "2309745",
@@ -108,7 +108,7 @@
     },
     {
       "date": "2019",
-      "name": "社会消费品零售",
+      "name": "社会消费品零售总额",
       "totalNum": [
         " 1219103",
         " 2476049",
@@ -214,7 +214,7 @@
     },
     {
       "date": "2020",
-      "name": "社会消费品零售",
+      "name": "社会消费品零售总额",
       "totalNum": [
         "1178374.83387367 ",
         " 2633724",
@@ -320,7 +320,7 @@
     },
     {
       "date": "2021",
-      "name": "社会消费品零售",
+      "name": "社会消费品零售总额",
       "totalNum": [
         "1661194.3 ",
         "3347583.6",
@@ -426,7 +426,7 @@
     },
 	{
 	  "date": "2022",
-	  "name": "社会消费品零售",
+	  "name": "社会消费品零售总额",
 	  "totalNum": [
 		"1666411.7"
 	  ],

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

@@ -16,10 +16,10 @@
         -4.3
       ],
 	  "growth": [
-	    -20.3,
-	    -1.7,
-	    -2.53,
-	    -4.3
+	    -20.7,
+	    -6.5,
+	    -4.2,
+	    -4.2
 	  ]
     },
     {
@@ -38,10 +38,10 @@
         3.72
       ],
 	  "growth": [
-	    17.3,
-	    10.7,
-	    5.56,
-	    3.72
+	    11.2,
+	    10.4,
+	    7.6,
+	    6.3
 	  ]
     },
     {
@@ -60,10 +60,10 @@
         0.69
       ],
 	  "growth": [
-	    -17.5,
-	    0.54,
-	    0.62,
-	    0.69
+	    -9.5,
+	    2.7,
+	    4.7,
+	    5.8
 	  ]
     },
     {
@@ -82,10 +82,10 @@
         9.49
       ],
 	  "growth": [
-	    59.7,
-	    17.4,
-	    15.35,
-	    9.49
+	    40.1,
+	    14.2,
+	    11.3,
+	    7.4
 	  ]
     },
     {