Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/natj/dataCenter/culturalTourism.html

@@ -10,9 +10,8 @@
     <link rel="stylesheet" href="css/index.css">
     <style>
         #whlyEchar {
-            width: 1450px;
+            width: 100%;
             height: 710px;
-            margin-left: -65px;
         }
     </style>
 </head>
@@ -88,11 +87,12 @@
             borderColor: 'none',
             formatter: function (params) {
                 console.log(params)
+                let total = params[0].value+params[1].value;
                 var html = "";
                 html = `<div
                     style="font-size: 14px;font-family: Microsoft YaHei;color: #FFFFFF;width: 306px;border-radius: 10px;box-sizing: border-box;position: relative;">
                     <div>`+ params[0].axisValue + `：</div>
-                    <div>`+ params[0].data + `人<span style="margin-left:20px;">同比：-7.62%</span></div>
+                    <div>`+ total + `人<span style="margin-left:20px;"></span></div>
                     <div style="width: 272px;height: 1px;background:rgb(255 255 255 / 32%);margin: 10px 0;"></div>
                     <div><span
                             style="width: 11px;height: 11px;background: `+ params[0].color + `;border-radius: 6px;"></span><span>` + params[0].seriesName + `：
@@ -100,7 +100,7 @@
                     </div>
                     <div><span
                             style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;"></span><span>` + params[1].seriesName + `：
-                        `+ params[1].value + `人</span><span style="margin-left:20px;">同比：-7.62%</span>
+                        `+ params[1].value + `人</span><span style="margin-left:20px;"></span>
                     </div>
                     <div style="position: absolute;border-right: 20px solid transparent;border-left: 20px solid transparent;
                     border-top: 20px solid rgb(0 0 0 / 60%);bottom: -30px;left: 20px;"></div>
@@ -182,5 +182,14 @@
     function setFooter(){
         $("#footer").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022foot/foot.html")
     }
+    //文化旅游菜单切换
+    function thisMonth() {
+        $('.cumulat').removeClass('click');
+        $('.thisMonth').addClass('click');
+    }
+    function cumulat() {
+        $('.cumulat').addClass('click');
+        $('.thisMonth').removeClass('click');
+    }
 </script>
 </html>

nngkxxdp/src/main/resources/static/natj/dataCenter/socialAssistance.html

@@ -10,9 +10,8 @@
     <link rel="stylesheet" href="css/index.css">
     <style>
         #shjzEchar {
-            width: 1450px;
+            width: 100%;
             height: 710px;
-            margin-left: -65px;
         }
     </style>
 </head>