Jelajahi Sumber

修改页面

sunjuan 2 tahun lalu
induk
melakukan
c3e2d8b940

+ 37 - 2
nngkxxdp/src/main/resources/static/natj/dataCenter/css/index.css

@@ -15,7 +15,7 @@
 
 .main .menu {
     width: 150px;
-    height: 729px;
+    height: 850px;
     background: #EBF4FF;
 }
 
@@ -142,6 +142,42 @@
 }
 
 /* 卫生医疗 */
+.div-wsyl .wsylTable {
+    margin-top: 70px;
+}
+
+.div-wsyl .wsylTable .title,
+.div-wsyl .wsylTable .number {
+    display: flex;
+    font-size: 18px;
+    font-family: Microsoft YaHei;
+    color: #FFFFFF;
+    margin-left: 10px;
+}
+
+.div-wsyl .wsylTable .title li,
+.div-wsyl .wsylTable .number li {
+    width: 160px;
+    height: 60px;
+    background: #7293B9;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-right: 1px solid #fff;
+}
+
+.div-wsyl .wsylTable .number li {
+    background: #fff;
+    color: #333;
+    border: 1px solid #7293B9;
+    border-right: none;
+}
+
+.div-wsyl .wsylTable .number li:last-child,
+.div-wsyl .wsylTable .title li:last-child {
+    border-right: 1px solid #7293B9;
+}
 .div-wsyl {
     height: 100%;
     padding-left: 10px;
@@ -197,7 +233,6 @@
 }
 /* 卫生医疗 */
 .div-wsyl .range {
-    width: 90%;
     display: flex;
     justify-content: flex-end;
 }

+ 25 - 9
nngkxxdp/src/main/resources/static/natj/dataCenter/index.html

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="css/index.css">
     <style>
         #whlyEchar {
-            width: 1475px;
+            width: 1005px;
             height: 710px;
         }
 
@@ -22,7 +22,7 @@
 </head>
 
 <body>
-<div style="width:100%;height:280px" id="header"></div>
+    <div style="width:100%;height:280px" id="header"></div>
     <div class="main">
         <div class="menu">
             <ul class="tabs">
@@ -137,10 +137,24 @@
                 </div>
             </div>
             <div class="items div-wsyl" style="display: none;">
-                <div class="range">
-                    <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
-                        onlick="thisMonth()">本月</button>
-                    <button class="cumulat" style="border-radius: 0px 4px 4px 0px;border-left: none;">累计</button>
+                <div style="display: flex;align-items: center;justify-content: space-between;width: 73%;">
+                    <div class="wsylTable">
+                        <ul class="title">
+                            <li style="width: 100px;">范围</li>
+                            <li><span>旅游总输入</span><span>(万元)</span></li>
+                            <li><span>旅游从业人员</span><span>(人)</span></li>
+                        </ul>
+                        <ul class="number">
+                            <li style="width: 100px;">当月</li>
+                            <li>322450</li>
+                            <li>31012</li>
+                        </ul>
+                    </div>
+                    <div class="range">
+                        <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
+                            onlick="thisMonth()">本月</button>
+                        <button class="cumulat" style="border-radius: 0px 4px 4px 0px;border-left: none;">累计</button>
+                    </div>
                 </div>
                 <div id="whlyEchar"></div>
             </div>
@@ -221,6 +235,7 @@
     } else if (type == 2) {
         tapsIndex = 1;
         culturalTourism();
+        $('.year').css('display', 'none');
     }
     else if (type == 3) {
         tapsIndex = 2;
@@ -270,7 +285,7 @@
         // 导航栏切换
         var tapsIndex = 0;
         $('.menu .tabs').on('click', 'li', function () {
-            if ($(this)[0].outerText == "社会救助") {
+            if ($(this)[0].outerText == "社会救助" || ($(this)[0].outerText == "文化旅游")) {
                 $('.year').css('display', 'none');
             } else {
                 $('.year').css('display', 'flex');
@@ -332,12 +347,13 @@
 <script>
     setHeader()
     setFooter()
-    function setHeader(){
+    function setHeader() {
         $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
     }
 
-    function setFooter(){
+    function setFooter() {
         $("#footer").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022foot/foot.html")
     }
 </script>
+
 </html>

+ 50 - 18
nngkxxdp/src/main/resources/static/natj/dataCenter/js/culturalTourism.js

@@ -2,7 +2,7 @@ function culturalTourism() {
     // 文化旅游
     var chartDom = document.getElementById('whlyEchar');
     var myChart = echarts.init(chartDom);
-    var alldata = [[4256415, 225424, 322450, 31012], [31762696, 1724264, 2370899, 286838]];
+    var alldata = [[4256415, 225424], [31762696, 1724264]];
     var option;
     var data = alldata[0]
     option = {
@@ -28,15 +28,15 @@ function culturalTourism() {
                 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>`+ total + `人<span style="margin-left:20px;"></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 + `:
-                        `+ params[0].value + `人</span>
+                        `+ params[0].value + `人</span>
                     </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;"></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>
@@ -46,7 +46,7 @@ function culturalTourism() {
         },
         xAxis: {
             type: 'category',
-            data: ['接待海内外游客', '过夜游客', '旅游总收入', '旅游从业人员'],
+            data: ['接待海内外游客', '过夜游客'],
             axisLabel: {
                 show: true,
                 textStyle: {
@@ -70,7 +70,7 @@ function culturalTourism() {
             max: 5000000,
             interval: 1000000,
             axisLabel: {
-                formatter: '{value}(个/万元)'
+                formatter: '{value}人次'
             },
             axisTick: {
                 show: true  //坐标轴刻度线
@@ -85,16 +85,19 @@ function culturalTourism() {
         series: [
             {
                 name: '海外游客',
-                data: [0, 0, 0, 0],
+                barWidth: 100,
+                data: [0, 0],
                 type: 'bar',
                 itemStyle: {
                     color: '#A7D0FD'
-                }
+                },
+
             },
             //4256415 225424 322450 31012
             //31762696 1724264 2370899 286838
             {
                 name: '海内游客',
+                barWidth: 100,
                 data: data,
                 type: 'bar',
                 barGap: '-100%',//移动第二个柱子的位置实现重叠
@@ -111,6 +114,19 @@ function culturalTourism() {
     $('.thisMonth').click(function () {
         $('.cumulat').removeClass('click');
         $('.thisMonth').addClass('click');
+        var shbzTableHtml = `
+        <ul class="title">
+        <li style="width: 100px;">范围</li>
+        <li><span>旅游总输入</span><span>(万元)</span></li>
+        <li><span>旅游从业人员</span><span>(人)</span></li>
+        </ul>
+                    <ul class="number">
+                        <li style="width: 100px;">当月</li>
+                        <li>322450</li>
+                        <li>31012</li>
+                    </ul>
+                `
+        $(".wsylTable").empty().html(shbzTableHtml)
         var option;
         var data = alldata[0]
         option = {
@@ -136,15 +152,15 @@ function culturalTourism() {
                     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>`+ total + `人<span style="margin-left:20px;"></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 + `:
-                        `+ params[0].value + `人</span>
+                        `+ params[0].value + `人</span>
                     </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;"></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>
@@ -154,7 +170,7 @@ function culturalTourism() {
             },
             xAxis: {
                 type: 'category',
-                data: ['接待海内外游客', '过夜游客', '旅游总收入', '旅游从业人员'],
+                data: ['接待海内外游客', '过夜游客'],
                 axisLabel: {
                     show: true,
                     textStyle: {
@@ -178,7 +194,7 @@ function culturalTourism() {
                 max: 5000000,
                 interval: 1000000,
                 axisLabel: {
-                    formatter: '{value}(个/万元)'
+                    formatter: '{value}(人次)'
                 },
                 axisTick: {
                     show: true  //坐标轴刻度线
@@ -193,7 +209,8 @@ function culturalTourism() {
             series: [
                 {
                     name: '海外游客',
-                    data: [0, 0, 0, 0],
+                    barWidth: 100,
+                    data: [0, 0],
                     type: 'bar',
                     itemStyle: {
                         color: '#A7D0FD'
@@ -203,6 +220,7 @@ function culturalTourism() {
                 //31762696 1724264 2370899 286838
                 {
                     name: '海内游客',
+                    barWidth: 100,
                     data: data,
                     type: 'bar',
                     barGap: '-100%',//移动第二个柱子的位置实现重叠
@@ -218,9 +236,21 @@ function culturalTourism() {
         option && myChart.setOption(option);
     })
     $('.cumulat').click(function () {
-
         $('.cumulat').addClass('click');
         $('.thisMonth').removeClass('click');
+        var shbzTableHtml = `
+        <ul class="title">
+        <li style="width: 100px;">范围</li>
+        <li><span>旅游总输入</span><span>(万元)</span></li>
+        <li><span>旅游从业人员</span><span>(人)</span></li>
+        </ul>
+                    <ul class="number">
+                        <li style="width: 100px;">累计</li>
+                        <li>2370899</li>
+                        <li>286838</li>
+                    </ul>
+                `
+        $(".wsylTable").empty().html(shbzTableHtml)
         var option;
         var data = alldata[1]
         option = {
@@ -264,7 +294,7 @@ function culturalTourism() {
             },
             xAxis: {
                 type: 'category',
-                data: ['接待海内外游客', '过夜游客', '旅游总收入', '旅游从业人员'],
+                data: ['接待海内外游客', '过夜游客'],
                 axisLabel: {
                     show: true,
                     textStyle: {
@@ -288,7 +318,7 @@ function culturalTourism() {
                 max: 5000000,
                 interval: 1000000,
                 axisLabel: {
-                    formatter: '{value}(个/万元)'
+                    formatter: '{value}(人次)'
                 },
                 axisTick: {
                     show: true  //坐标轴刻度线
@@ -303,7 +333,8 @@ function culturalTourism() {
             series: [
                 {
                     name: '海外游客',
-                    data: [0, 0, 0, 0],
+                    barWidth: 100,
+                    data: [0, 0],
                     type: 'bar',
                     itemStyle: {
                         color: '#A7D0FD'
@@ -313,6 +344,7 @@ function culturalTourism() {
                 //31762696 1724264 2370899 286838
                 {
                     name: '海内游客',
+                    barWidth: 100,
                     data: data,
                     type: 'bar',
                     barGap: '-100%',//移动第二个柱子的位置实现重叠