2024415修改

nngkxxdp/src/main/resources/static/district/js/sy.js

@@ -534,9 +534,9 @@ $(function () {
                             sContnet += ''
                         } else if (arrSptype == '查阅场所') {
                             sContnet += "<p style='color: #666666'><span class='flex_address'>查询时间：</span>" + arrtime + "</p>"
-                        } else if (arrSptype == '受理场所') {
+                        } else if (arrSptype == '受理场所'||arrSptype == '政务服务') {
                             sContnet += "<p style='color: #666666'><span class='flex_address'>受理时间：</span>" + arrtime + "</p>"
-                        } else if (arrSptype == '政务服务' || arrSptype == '办税服务') {
+                        } else if (arrSptype == '办税服务') {
                             sContnet += "<p style='color: #666666'><span class='flex_address'>办理时间：</span>" + arrtime + "</p>"
                         } else {
                             sContnet += "<p style='color: #666666'><span class='flex_address'>办公时间：</span>" + arrtime + "</p>"

nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -1303,12 +1303,12 @@ function getDistances(lat1, lng1, lat2, lng2) {
             "<p><span class='flex_address'>查询时间：</span>" +
             arrtime +
             "</p>";
-        } else if (arrsptype == "受理场所") {
+        } else if (arrsptype == "受理场所"||arrsptype == "政务服务") {
           sContnet +=
             "<p><span class='flex_address'>受理时间：</span>" +
             arrtime +
             "</p>";
-        } else if (arrsptype == "政务服务" || arrsptype == "办税服务") {
+        } else if (arrsptype == "办税服务") {
           sContnet +=
             "<p><span class='flex_address'>办理时间：</span>" +
             arrtime +

nngkxxdp/src/main/resources/static/natj/dataCenter/js/closeCase.js

@@ -35,6 +35,7 @@ function closeCase() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+        "2024年一季度"
       ],
     },
     yAxis: [
@@ -55,7 +56,7 @@ function closeCase() {
       {
         name: "纠纷总数",
         type: "bar",
-        data: [1285, 2257, 3370, 5085, 1375, 3057, 4592, 7911],
+        data: [1285, 2257, 3370, 5085, 1375, 3057, 4592, 7911,2272],
         yAxisIndex: 0,
         tooltip: {
           valueFormatter: function (value) {
@@ -66,7 +67,7 @@ function closeCase() {
       {
         name: "涉及人数",
         type: "bar",
-        data: [1285, 2257, 3370, 5210, 1401, 3142, 4625, 8000],
+        data: [1285, 2257, 3370, 5210, 1401, 3142, 4625, 8000,2300],
         yAxisIndex: 1,
         tooltip: {
           valueFormatter: function (value) {
@@ -77,7 +78,7 @@ function closeCase() {
       {
         name: "结案数量",
         type: "bar",
-        data: [921, 1903, 2974, 4831, 972, 2262, 3922, 7120],
+        data: [921, 1903, 2974, 4831, 972, 2262, 3922, 7120,1857],
         yAxisIndex: 0,
         tooltip: {
           valueFormatter: function (value) {
@@ -128,6 +129,7 @@ function closeCase() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+        "2024年一季度"
       ],
       axisLabel:{
         rotate :30
@@ -143,7 +145,7 @@ function closeCase() {
       {
         name: "仲裁裁决数",
         type: "bar",
-        data: [49, 161, 290, 386, 57, 177, 306, 371],
+        data: [49, 161, 290, 386, 57, 177, 306, 371,128],
         tooltip: {
           valueFormatter: function (value) {
             return value + " 件";
@@ -189,6 +191,7 @@ function closeCase() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+        "2024年一季度"
       ],
       axisLabel:{
         rotate :30
@@ -202,7 +205,7 @@ function closeCase() {
     },
     series: [
       {
-        data: [71.67, 84.31, 88.24, 95, 71, 74, 85, 90],
+        data: [71.67, 84.31, 88.24, 95, 71, 74, 85, 90,81.73],
         type: "line",
         name: "结案率",
         itemStyle: {

nngkxxdp/src/main/resources/static/natj/dataCenter/js/employment.js

@@ -37,6 +37,7 @@ function employment() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+		"2024年一季度",
       ],
     },
     yAxis: [
@@ -60,7 +61,7 @@ function employment() {
         name: "城镇新增就业人数",
         type: "bar",
         yAxisIndex: 0,
-        data: [0.93, 2.16, 3.8, 4.43, 1.41, 2.92, 4.27, 5.30],
+        data: [0.93, 2.16, 3.8, 4.43, 1.41, 2.92, 4.27, 5.30,1.14],
         itemStyle: {
           color: "#509EF3",
         },
@@ -74,7 +75,7 @@ function employment() {
         name: "城镇登记失业人员就业人数",
         type: "bar",
         yAxisIndex: 0,
-        data: [0.21, 0.38, 0.93, 1.08, 0.69, 1.07, 1.15, 1.35],
+        data: [0.21, 0.38, 0.93, 1.08, 0.69, 1.07, 1.15, 1.35,0.30],
         tooltip: {
           valueFormatter: function (value) {
             return value + " 万人";
@@ -85,7 +86,7 @@ function employment() {
         name: "城镇调查失业率",
         type: "line",
         yAxisIndex: 1,
-        data: [5.4, 5.4, 5.4, 5.3, 5.5, 5.4, 5.4, 5.3],
+        data: [5.4, 5.4, 5.4, 5.3, 5.5, 5.4, 5.4, 5.3,4.5],
         tooltip: {
           valueFormatter: function (value) {
             return value + " %";

nngkxxdp/src/main/resources/static/natj/dataCenter/js/skills.js

@@ -36,6 +36,7 @@ function skills() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+		"2024年一季度",
       ],
     },
     yAxis: {
@@ -48,7 +49,7 @@ function skills() {
       {
         name: "创业贷款发放金额",
         type: "bar",
-        data: [786, 1726, 2466, 3216, 622, 1701, 2342, 3092],
+        data: [786, 1726, 2466, 3216, 622, 1701, 2342, 3092,50],
         tooltip: {
           valueFormatter: function (value) {
             return value + " 万元";
@@ -97,6 +98,7 @@ function skills() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+        "2024年一季度"
       ],
     },
     yAxis: {
@@ -109,7 +111,7 @@ function skills() {
       {
         name: "参加职业技能等级评价",
         type: "bar",
-        data: [1109, 2392, 3349, 6745, 1367, 6345, 8723, 13975],
+        data: [1109, 2392, 3349, 6745, 1367, 6345, 8723, 13975,919],
         tooltip: {
           valueFormatter: function (value) {
             return value + " 人";
@@ -158,6 +160,7 @@ function skills() {
         "2023年二季度",
         "2023年三季度",
 		"2023年四季度",
+        "2024年一季度"
       ],
     },
     yAxis: {
@@ -170,7 +173,7 @@ function skills() {
       {
         name: "补贴性职业培训人数",
         type: "bar",
-        data: [0.18, 0.58, 0.74, 1.11, 0.26, 0.62, 0.79, 0.88],
+        data: [0.18, 0.58, 0.74, 1.11, 0.26, 0.62, 0.79, 0.88,0.19],
         tooltip: {
           valueFormatter: function (value) {
             return value + " 万人";

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

@@ -409,7 +409,7 @@ function getAllScale(obj, myChart) {
 
         }
         var chat = [{
-            'name': obj.title,
+            'name': obj.data.title,
             'data': array,
             'color1': obj.color1,
             'color2': obj.color2,
@@ -854,6 +854,7 @@ getData('./json/jdp.json').then(data => {
 })
 
 getData('./json/scale.json').then(data => {
+    console.log(data)
     var myChartScale = echarts.init(document.getElementById('scalemain'))
     var option = getBarl(data.scale, '%');
     myChartScale.setOption(option, true);
@@ -869,6 +870,7 @@ getData('./json/fixedAssets.json').then(data => {
 
 function getBarl(list, unit) {
     // var dateNum = ['date'];
+    debugger
     var dateNum = [];
     var alloneBasis = [];
     var growth = [];

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

@@ -86,12 +86,14 @@
       "totalNum": [
         "717044.7",
         "1928894",
-        "3243122.5"
+        "3243122.5",
+        "4541990.6"
       ],
       "alloneBasis": [
         11.5,
         10.8,
-        10.2
+        10.2,
+        10.7
       ]
     }
   ]

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

@@ -359,6 +359,10 @@
             {
               "totalQuarter": 411152,
               "oneBasis": 5.8
+            },
+            {
+              "totalQuarter": 655185,
+              "oneBasis": 15.3
             }]
         },
         {
@@ -375,6 +379,10 @@
             {
               "totalQuarter": 312490,
               "oneBasis": 4.7
+            },
+            {
+              "totalQuarter": 503004,
+              "oneBasis": 27.4
             }]
         },
         {
@@ -391,6 +399,10 @@
             {
               "totalQuarter": 609492,
               "oneBasis":2
+            },
+            {
+              "totalQuarter": 970770,
+              "oneBasis":6.7
             }]
         }
       ]

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

@@ -111,13 +111,14 @@
       "totalNum": [
         "631356",
         "631356",
+        "",
         ""
       ],
       "alloneBasis": [
         12.3,
         12.3
       ],
-      "growth":[17.5,4.9,-7.3]
+      "growth":[17.5,4.9,-7.3,-3.6]
     }
   ]
 }

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

@@ -536,12 +536,14 @@
       "totalNum": [
         "1741563.0",
         "3487136",
-        "4998162.2"
+        "4998162.2",
+        "6236012.8"
       ],
       "alloneBasis": [
         4.5,
         4.1,
-        6.0
+        6.0,
+        6.5
       ],
       "subData": [
         {
@@ -555,6 +557,14 @@
             {
               "totalQuarter": 7809184.8,
               "oneBasis": 16.6
+            },
+            {
+              "totalQuarter": 7809184.8,
+              "oneBasis": 16.6
+            },
+            {
+              "totalQuarter": 12990827.1,
+              "oneBasis": 8.6
             }
           ]
         },
@@ -569,6 +579,14 @@
             {
               "totalQuarter": 2306602.1,
               "oneBasis": 6.7
+            },
+            {
+              "totalQuarter": 2306602.1,
+              "oneBasis": 6.7
+            },
+            {
+              "totalQuarter": 4570238.2,
+              "oneBasis": 10.7
             }
           ]
         },
@@ -583,6 +601,14 @@
             {
               "totalQuarter": 122432.3,
               "oneBasis": 26.4
+            },
+            {
+              "totalQuarter": 122432.3,
+              "oneBasis": 26.4
+            },
+            {
+              "totalQuarter": 245188.5,
+              "oneBasis": 27.6
             }
           ]
         },
@@ -597,6 +623,14 @@
             {
               "totalQuarter": 294770.7,
               "oneBasis": 13.4
+            },
+            {
+              "totalQuarter": 294770.7,
+              "oneBasis": 13.4
+            },
+            {
+              "totalQuarter": 712986.1,
+              "oneBasis": 16.4
             }
           ]
         }

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

@@ -442,17 +442,20 @@
       "totalNum": [
         "2311803",
         "4697216",
-        "7158165"
+        "7158165",
+        "9851877"
       ],
       "alloneBasis": [
         4.8,
         3.7,
-        5.8
+        5.8,
+        6.7
       ],
       "growth": [
         4.8,
         3.7,
-        5.8
+        5.8,
+        6.7
       ],
       "subData": [
         {
@@ -470,7 +473,11 @@
             "totalQuarter": 34438,
             "oneBasis": 4.5,
             "proportion": 0.5
-          }]
+          }, {
+              "totalQuarter": 48500,
+              "oneBasis": 2.8,
+              "proportion": 0.5
+            }]
         },
         {
           "type": 102,
@@ -487,6 +494,10 @@
             "totalQuarter": 2546920,
             "oneBasis": 6.3,
             "proportion": 35.6
+          },{
+            "totalQuarter": 3813919,
+            "oneBasis": 6.8,
+            "proportion": 38.7
           }]
         },
         {
@@ -504,6 +515,10 @@
             "totalQuarter": 4576807,
             "oneBasis": 5.6,
             "proportion":63.9
+          },{
+            "totalQuarter": 5989458,
+            "oneBasis": 6.6,
+            "proportion":60.8
           }]
         }
       ]

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

@@ -86,12 +86,14 @@
       "totalNum": [
         "38.6633",
         "75.8279",
-        "103.6175"
+        "103.6175",
+        "131.7"
       ],
       "alloneBasis": [
         2.3,
         -25.14,
-        -14.6
+        -14.6,
+        -11.9
       ]
     }
   ]

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

@@ -111,13 +111,14 @@
       "totalNum": [
         "2313252.8",
         "2313252.8",
+        "",
         ""
       ],
       "alloneBasis": [
         59.7,
         59.7
       ],
-      "growth":[5.0,3.4,5.2]
+      "growth":[5.0,3.4,5.2,6.0]
     }
   ]
 }