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

# Conflicts:
#	nngkxxdp/src/main/resources/static/hqzc/index.html

nngkxxdp/src/main/resources/static/hqzc/index.html

@@ -256,9 +256,11 @@
                 data: { page: pages, limit: limit, title: qt, type: zcfxArr, qygmArr: qygmArr, industrySectors: hylxArr, unit: zzbmArr, freeApplication: valTemp },
                 dataType: "json",
                 success: function (data) {
+
                     if (data.code == 0) {
                         document.getElementById("totalDocs").innerText = data.count;
 
+
                         var docList = data.data;
 
                         total = data.count

nngkxxdp/src/main/resources/static/natj/dataCenter/css/index.css

@@ -152,13 +152,33 @@ select {
     border-right: 1px solid #7293B9;
 }
 
-/* 卫生医疗 */
-.div-wsyl .wsylTable {
+/* 文化文旅*/
+.div-whwl .range {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.div-whwl .range button {
+    width: 63px;
+    height: 34px;
+    background: #FFFFFF;
+    border: 1px solid #999999;
+    color: #999999;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    cursor: pointer;
+}
+
+.div-whwl .range button.click {
+    border: 1px solid #4582EC !important;
+    color: #4684ED;
+}
+.div-whwl .wsylTable {
     margin-top: 70px;
 }
 
-.div-wsyl .wsylTable .title,
-.div-wsyl .wsylTable .number {
+.div-whwl .wsylTable .title,
+.div-whwl .wsylTable .number {
     display: flex;
     font-size: 18px;
     font-family: Microsoft YaHei;
@@ -166,8 +186,8 @@ select {
     margin-left: 10px;
 }
 
-.div-wsyl .wsylTable .title li,
-.div-wsyl .wsylTable .number li {
+.div-whwl .wsylTable .title li,
+.div-whwl .wsylTable .number li {
     width: 160px;
     height: 60px;
     background: #7293B9;
@@ -178,17 +198,19 @@ select {
     border-right: 1px solid #fff;
 }
 
-.div-wsyl .wsylTable .number li {
+.div-whwl .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 {
+.div-whwl .wsylTable .number li:last-child,
+.div-whwl .wsylTable .title li:last-child {
     border-right: 1px solid #7293B9;
 }
+
+/* 卫生医疗 */
 .div-wsyl {
     height: 100%;
     padding-left: 10px;
@@ -241,29 +263,21 @@ select {
     color: #125DB2;
     line-height: 36px;
 }
-/* 卫生医疗 */
-.div-wsyl .range {
-    display: flex;
-    justify-content: flex-end;
-}
 
-.div-wsyl .range button {
-    width: 63px;
-    height: 34px;
-    background: #FFFFFF;
-    border: 1px solid #999999;
-    color: #999999;
-    font-size: 16px;
-    font-family: Microsoft YaHei;
-    cursor: pointer;
-}
-
-.div-wsyl .range button.click {
-    border: 1px solid #4582EC !important;
-    color: #4684ED;
+.div-wsyl .right .title {
+    width: 676px;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #E9E9E9;
+    border-radius: 10px 10px 0px 0px;
+    font-size: 18px;
+    color: #333333;
+    margin-left: 0;
+    margin-bottom: -1px;
 }
 /* 社会救助 */
-.div-shjz .title {
+.div-shjz .title,.div-wsyl .title {
     width: 100%;
     height: 50px;
     margin: 10px auto;
@@ -271,12 +285,13 @@ select {
     margin-left: 10px;
 }
 
-.div-shjz .title {
+.div-shjz .title,.div-wsyl .title {
     display: flex;
     justify-content: center;
 }
 
-.div-shjz .title .list {
+.div-shjz .title .list,
+.div-wsyl .title .list {
     width: 208px;
     height: 50px;
     line-height: 50px;
@@ -288,7 +303,83 @@ select {
     cursor: pointer;
 }
 
-.div-shjz .title .select {
+.div-shjz .title .select,
+.div-wsyl .title .select {
     background: #125DB2;
     color: #fff;
+}
+/* 教育领域 */
+.div-jyly .title {
+    font-size: 20px;
+    color: #333333;
+    margin: 20px auto;
+    text-align: center;
+}
+
+.div-jyly .itemData {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.div-jyly .itemData li {
+    width: 265px;
+    height: 130px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    font-size: 18px;
+    color: #333333;
+    margin-top: 19px;
+}
+
+.div-jyly .itemData li .right .bottom {
+    display: flex;
+    align-items: flex-end;
+    margin-top: 16px;
+}
+
+.div-jyly .itemData li .right .bottom .number {
+    font-size: 34px;
+    font-weight: bold;
+    font-style: italic;
+    color: #004A93;
+}
+
+.div-jyly .itemData li .right .bottom .unit {
+    color: #999999;
+    margin-left: 10px;
+}
+
+.div-jyly .jylyTable .titleList,
+.div-jyly .jylyTable .number {
+    display: flex;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    color: #FFFFFF;
+    margin-left: 20px;
+}
+
+.div-jyly .jylyTable .titleList li,
+.div-jyly .jylyTable .number li {
+    width: 500px;
+    height: 60px;
+    background: #7293B9;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-right: 1px solid #fff;
+}
+
+.div-jyly .jylyTable .number li {
+    background: #fff;
+    color: #333;
+    border: 1px solid #7293B9;
+    border-right: none;
+}
+
+.div-jyly .jylyTable .number li:last-child,
+.div-jyly .jylyTable .titleList li:last-child {
+    border-right: 1px solid #7293B9;
 }

nngkxxdp/src/main/resources/static/natj/dataCenter/css/indexMbile.css

@@ -145,7 +145,7 @@ select::-ms-expand {
 
 .div-shbz .shbzTablem .title li,
 .div-shbz .shbzTablem .number li {
-    width: 260px;
+    width: 120px;
     height: 60px;
     background: #7293B9;
     display: flex;
@@ -271,37 +271,146 @@ select::-ms-expand {
     color: #125DB2;
     line-height: 36px;
 }
+
+.div-wsyl .right .title {
+    width: 100vw;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #E9E9E9;
+    border-radius: 10px 10px 0px 0px;
+    font-size: 18px;
+    color: #333333;
+    margin-left: 0;
+    margin-bottom: -1px;
+}
+
+.div-wsyl .title .select {
+    background: #125DB2;
+    color: #fff !important;
+    overflow: auto;
+    display: flex;
+    white-space: normal;
+    text-overflow: unset;
+    align-items: center;
+    justify-content: center;
+    line-height: 20px;
+}
 /* 社会救助 */
-.div-shjz{
-    overflow-x: scroll;
-    width: 1075px;
+.div-shjz,.div-wsyl{
+    /* overflow-x: scroll;
+    width: 1075px; */
 }
-.div-shjz .title {
-    width: 1054px;
+.div-shjz .title,.div-wsyl .title {
+    width: 100%;
     height: 50px;
     margin: 10px auto;
     background: #EBF4FF;
-    margin-left: 10px;
 }
 
-.div-shjz .title {
+.div-shjz .title,.div-wsyl .title {
     display: flex;
-    justify-content: center;
+    justify-content: space-evenly;
 }
 
-.div-shjz .title .list {
-    width: 208px;
+.div-shjz .title .list,.div-wsyl .title .list {
+    width: 140px;
     height: 50px;
     line-height: 50px;
-    font-size: 16px;
+    font-size: 14px;
     font-family: Microsoft YaHei;
     color: #333333;
     text-align: center;
-    margin: 0 47px;
     cursor: pointer;
+    padding: 0 5px;
+    box-sizing: border-box;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .div-shjz .title .select {
     background: #125DB2;
-    color: #fff;
+    color: #fff !important;
+    overflow: auto;
+    display: flex;
+    white-space: normal;
+    text-overflow: unset;
+    align-items: center;
+    justify-content: center;
+    line-height: 20px;
+}
+/* 教育领域 */
+.div-jyly .title {
+    font-size: 20px;
+    color: #333333;
+    margin: 20px auto;
+    text-align: center;
+}
+
+.div-jyly .itemData {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.div-jyly .itemData li {
+    width: 265px;
+    height: 130px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    font-size: 18px;
+    color: #333333;
+}
+
+.div-jyly .itemData li .right .bottom {
+    display: flex;
+    align-items: flex-end;
+    margin-top: 16px;
+}
+
+.div-jyly .itemData li .right .bottom .number {
+    font-size: 34px;
+    font-weight: bold;
+    font-style: italic;
+    color: #004A93;
+}
+
+.div-jyly .itemData li .right .bottom .unit {
+    color: #999999;
+    margin-left: 10px;
+}
+
+.div-jyly .jylyTable .titleList,
+.div-jyly .jylyTable .number {
+    display: flex;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    color: #FFFFFF;
+    margin: auto 10px;
+}
+
+.div-jyly .jylyTable .titleList li,
+.div-jyly .jylyTable .number li {
+    width: 500px;
+    height: 60px;
+    background: #7293B9;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-right: 1px solid #fff;
+}
+
+.div-jyly .jylyTable .number li {
+    background: #fff;
+    color: #333;
+    border: 1px solid #7293B9;
+    border-right: none;
+}
+
+.div-jyly .jylyTable .number li:last-child,
+.div-jyly .jylyTable .titleList li:last-child {
+    border-right: 1px solid #7293B9;
 }

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

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>数据中心</title>
+    <title>数据中心-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
     <style>
@@ -18,6 +18,37 @@
             width: 1400px;
             height: 710px;
         }
+
+        #jylyPerEchar,
+        #jylySchoolEchar {
+            width: 500px;
+            height: 600px;
+        }
+
+        #wsylchar {
+            width: 600px;
+            height: 710px;
+        }
+
+        #other1,
+        #other2 {
+            width: 674px;
+            height: 300px;
+            border: 1px solid #ccc;
+            border-top: none;
+        }
+
+        #ylryEchar {
+            width: 800px;
+            height: 710px;
+            margin: auto;
+        }
+
+        #zlrsEchar {
+            width: 800px;
+            height: 710px;
+            margin: auto;
+        }
     </style>
 </head>
 
@@ -43,25 +74,29 @@
                         data-name="shjz"><span>社会救助</span>
                     <div class="arrow" style="visibility: hidden;"></div>
                 </li>
+                <li data-name="jyly"><img src="images/menu_jyly.png" alt="" style="width: 31px;height: 27px;"
+                        data-name="jyly"><span>教育领域</span>
+                    <div class="arrow" style="visibility: hidden;"></div>
+                </li>
             </ul>
         </div>
         <div class="content">
-            <div class="year" style="position: relative;">
-                <span>年份：</span>
-                <select id="year">
-                    <option value="2021">2021年</option>
-                    <option value="2022">2022年</option>
-                </select>
-                <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
-            </div>
-            <div class="items div-shbz">
+            <div class="items div-shbz" style="display: none;">
+                <div class="year" style="position: relative;">
+                    <span>年份：</span>
+                    <select id="year">
+                        <option value="2021">2021年</option>
+                        <option value="2022">2022年</option>
+                    </select>
+                    <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
+                </div>
                 <ul class="itemData">
                     <li>
                         <img src="images/content_icon_one.png" alt="">
                         <div class="right">
                             <div>城镇新增就业人数</div>
                             <div class="bottom">
-                                <div class="number">3.74</div>
+                                <div class="number">3.8</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -71,7 +106,7 @@
                         <div class="right">
                             <div>城镇登记失业人员就业人数</div>
                             <div class="bottom">
-                                <div class="number">0.76</div>
+                                <div class="number">0.93</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -91,7 +126,7 @@
                         <div class="right">
                             <div>创业贷款发放金额</div>
                             <div class="bottom">
-                                <div class="number">3486</div>
+                                <div class="number">2466</div>
                                 <div class="unit">万元</div>
                             </div>
                         </div>
@@ -101,7 +136,7 @@
                         <div class="right">
                             <div>参加职业技能鉴定</div>
                             <div class="bottom">
-                                <div class="number">8330</div>
+                                <div class="number">7489</div>
                                 <div class="unit">人</div>
                             </div>
                         </div>
@@ -111,7 +146,7 @@
                         <div class="right">
                             <div>补贴性职业培训人数</div>
                             <div class="bottom">
-                                <div class="number">1.84</div>
+                                <div class="number">0.74</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -121,7 +156,7 @@
                     <div style="text-align: center;width:100%;font-size: 22px;color: #333333;margin: 20px auto;">劳动争议案件
                     </div>
                     <ul class="title">
-                        <li style="width: 200px;">年份</li>
+                        <li style="width: 201px;">年份</li>
                         <li><span>纠纷总数</span><span>（件）</span></li>
                         <li><span>涉及人数</span><span>（个）</span></li>
                         <li><span>结案数量</span><span>（件）</span></li>
@@ -129,16 +164,16 @@
                         <li><span>结案率</span><span>（%）</span></li>
                     </ul>
                     <ul class="number">
-                        <li style="width: 200px;">2021</li>
-                        <li>4259</li>
-                        <li>4270</li>
-                        <li>4012</li>
-                        <li>386</li>
-                        <li>97</li>
+                        <li style="width: 200px;">2022</li>
+                        <li>4246</li>
+                        <li>4300</li>
+                        <li>3697</li>
+                        <li>318</li>
+                        <li>87</li>
                     </ul>
                 </div>
             </div>
-            <div class="items div-wsyl" style="display: none;">
+            <div class="items div-whwl" style="display: none;">
                 <div style="display: flex;align-items: center;justify-content: space-between;width: 73%;">
                     <div class="wsylTable">
                         <ul class="title">
@@ -161,7 +196,29 @@
                 <div id="whlyEchar"></div>
             </div>
             <div class="items div-wsyl" style="display: none;">
-                <div class="cont" style="left: 58px;bottom: 146px;">
+                <ul class="title">
+                    <li class="list select" data-type="1" id="zdsh">医疗机构、床位数</li>
+                    <li class="list" data-type="2">医疗卫生人员</li>
+                    <li class="list" data-type="3">诊疗人数</li>
+                </ul>
+                <div style="display: flex;" class="yljgcws">
+                    <div class="left">
+                        <div id="wsylchar"></div>
+                    </div>
+                    <div class="right">
+                        <div>
+                            <div class="title">2021</div>
+                            <div id="other1"></div>
+                        </div>
+                        <div>
+                            <div class="title">2022</div>
+                            <div id="other2"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="ylry" id="ylryEchar"></div>
+                <div class="zlrs" id="zlrsEchar"></div>
+                <!-- <div class="cont" style="left: 58px;bottom: 146px;">
                     <div class="detail" style="background-image: url(images/bg-1.png);">
                         <ul class="list ylfirst">
                             <li><span>医疗卫生机构数：</span><span>628</span></li>
@@ -201,7 +258,8 @@
                     </div>
                     <img src="images/content_tipthree.png" alt="">
                 </div>
-                <img src="images/content_bg.png" alt="" class="bg">
+                <img src="images/content_bg.png" alt="" class="bg"> -->
+
             </div>
             <div class="items div-shjz" style="display: none;">
                 <ul class="title">
@@ -211,6 +269,37 @@
                 </ul>
                 <div id="shjzEchar"></div>
             </div>
+            <div class="items div-jyly" style="height: 900px;display: none;">
+                <div class="year" style="position: relative;">
+                    <span>年份：</span>
+                    <select id="yearl">
+                        <option value="2019">2019年</option>
+                        <option value="2020">2020年</option>
+                        <option value="2021">2021年</option>
+                    </select>
+                    <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
+                </div>
+                <div style="display: flex;">
+                    <div class="perAndSchool">
+                        <div class="title">学生人数与学校数统计</div>
+                        <div style="display: flex;">
+                            <div id="jylyPerEchar"></div>
+                            <div id="jylySchoolEchar"></div>
+                        </div>
+                    </div>
+                    <div class="other">
+                        <div class="title">学前教育其他数据</div>
+                        <ul class="itemData">
+
+                        </ul>
+                    </div>
+                </div>
+                <div class="zhongzhi">
+                    <div class="jylyTable">
+
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div style="width:100%;" id="footer"></div>
@@ -224,7 +313,9 @@
 <!-- 文化文旅数据js -->
 <script src="js/culturalTourism.js"></script>
 <!-- 卫生医疗数据js -->
-<script src="js/healthCare.js"></script>
+<script src="js/healthCareNew.js"></script>
+<!-- 教育领域数据js -->
+<script src="js/education.js"></script>
 <script>
     // 判断进入的参数值
     function GetQueryString(name) {
@@ -241,16 +332,18 @@
     } else if (type == 2) {
         tapsIndex = 1;
         culturalTourism();
-        $('.year').css('display', 'none');
     }
     else if (type == 3) {
         tapsIndex = 2;
-        healthCare();
+        healthCareNew();
     }
     else if (type == 4) {
         tapsIndex = 3;
         socialAssistance();
-        $('.year').css('display', 'none');
+    }
+    else if (type == 5) {
+        tapsIndex = 4;
+        education();
     }
     var tapsContItem = $('.content .items');
     var tabsArrow = $('.menu .tabs .arrow');
@@ -291,11 +384,6 @@
         // 导航栏切换
         var tapsIndex = 0;
         $('.menu .tabs').on('click', 'li', function () {
-            if ($(this)[0].outerText == "社会救助" || ($(this)[0].outerText == "文化旅游")) {
-                $('.year').css('display', 'none');
-            } else {
-                $('.year').css('display', 'flex');
-            }
             var tapsContItem = $('.content .items');
             var tapsTitleLi = $('.menu .tabs li');
             var tabsImg = $('.menu .tabs img');
@@ -311,10 +399,13 @@
                     } else if (index == 1) {
                         culturalTourism();
                     } else if (index == 2) {
-                        healthCare();
+                        healthCareNew();
                     } else if (index == 3) {
                         socialAssistance();
                     }
+                    else if (index == 4) {
+                        education();
+                    }
                 }
             });
 
@@ -349,6 +440,12 @@
         tapsTitleLi.removeClass('select');
         $(this).addClass('select');
     })
+    //卫生医疗菜单导航
+    $('.div-wsyl .title').on('click', 'li', function () {
+        var tapsTitleLi = $('.div-wsyl .title li');
+        tapsTitleLi.removeClass('select');
+        $(this).addClass('select');
+    })
 </script>
 <script>
     setHeader()

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

@@ -5,26 +5,75 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>数据中心</title>
+    <title>数据中心-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/indexMbile.css">
     <style>
+        html {
+            overflow-y: scroll;
+        }
+
+        :root {
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
+        :root body {
+            position: absolute;
+        }
+
+        body {
+            width: 100vw;
+            overflow: hidden;
+        }
+
         #whlyEchar {
-            width: 475px;
+            width: 100vw;
             height: 510px;
         }
 
         #shjzEchar {
-            width: 1075px;
+            width: 100vw;
+            height: 710px;
+        }
+
+        #jylyPerEchar,
+        #jylySchoolEchar {
+            width: 100vw;
+            height: 500px;
+        }
+
+        #wsylchar {
+            width: 100vw;
             height: 710px;
         }
+
+        #other1,
+        #other2 {
+            width: 99vw;
+            height: 500px;
+            border: 1px solid #ccc;
+            border-top: none;
+        }
+
+        #ylryEchar {
+            width: 100vw;
+            height: 710px;
+            margin: auto;
+        }
+
+        #zlrsEchar {
+            width: 100vw;
+            height: 710px;
+            margin: auto;
+        }
     </style>
 </head>
 
 <body>
     <div style="width:100%;height:280px" id="header"></div>
     <div class="main">
-        <div class="menu">
+        <div class="menu" id="menu">
             <ul class="tabs">
                 <li data-name="shbz" style="margin-top: -4px;">
                     <div class="list">
@@ -47,25 +96,30 @@
                             data-name="shjz"><span>社会救助</span>
                     </div>
                 </li>
+                <li data-name="jyly">
+                    <div class="list"><img src="images/menu_jyly.png" alt="" style="width: 34px;height: 28px;"
+                            data-name="jyly"><span>教育领域</span>
+                    </div>
+                </li>
             </ul>
         </div>
         <div class="content">
-            <div class="year" style="position: relative;">
-                <span>年份：</span>
-                <select id="year">
-                    <option value="2021">2021年</option>
-                    <option value="2022">2022年</option>
-                </select>
-                <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
-            </div>
             <div class="items div-shbz" style="display: none;">
+                <div class="year" style="position: relative;">
+                    <span>年份：</span>
+                    <select id="year">
+                        <option value="2021">2021年</option>
+                        <option value="2022">2022年</option>
+                    </select>
+                    <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
+                </div>
                 <ul class="itemData">
                     <li>
                         <img src="images/content_icon_one.png" alt="">
                         <div class="right">
                             <div>城镇新增就业人数</div>
                             <div class="bottom">
-                                <div class="number">3.74</div>
+                                <div class="number">3.8</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -75,7 +129,7 @@
                         <div class="right">
                             <div>城镇登记失业人员就业人数</div>
                             <div class="bottom">
-                                <div class="number">0.76</div>
+                                <div class="number">0.93</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -95,7 +149,7 @@
                         <div class="right">
                             <div>创业贷款发放金额</div>
                             <div class="bottom">
-                                <div class="number">3486</div>
+                                <div class="number">2466</div>
                                 <div class="unit">万元</div>
                             </div>
                         </div>
@@ -105,7 +159,7 @@
                         <div class="right">
                             <div>参加职业技能鉴定</div>
                             <div class="bottom">
-                                <div class="number">8330</div>
+                                <div class="number">7489</div>
                                 <div class="unit">人</div>
                             </div>
                         </div>
@@ -115,7 +169,7 @@
                         <div class="right">
                             <div>补贴性职业培训人数</div>
                             <div class="bottom">
-                                <div class="number">1.84</div>
+                                <div class="number">0.74</div>
                                 <div class="unit">万人</div>
                             </div>
                         </div>
@@ -125,24 +179,24 @@
                     <div style="text-align: center;width:100%;font-size: 20px;color: #333333;margin: 20px auto;">劳动争议案件
                     </div>
                     <ul class="title">
-                        <li>年份</li>
+                        <li style="width: 121px;">年份</li>
                         <li><span>纠纷总数</span><span>（件）</span></li>
                         <li><span>涉及人数</span><span>（个）</span></li>
                     </ul>
                     <ul class="number">
-                        <li>2021</li>
-                        <li>4259</li>
-                        <li>4270</li>
+                        <li>2022</li>
+                        <li>4246</li>
+                        <li>4300</li>
                     </ul>
                     <div class="title">
-                        <li><span>结案数量</span><span>（件）</span></li>
+                        <li style="width: 121px;"><span>结案数量</span><span>（件）</span></li>
                         <li><span>仲裁裁决</span><span>（件）</span></li>
                         <li><span>结案率</span><span>（%）</span></li>
                     </div>
                     <div class="number">
-                        <li>4012</li>
-                        <li>386</li>
-                        <li>97</li>
+                        <li>3697</li>
+                        <li>318</li>
+                        <li>87</li>
                     </div>
                 </div>
             </div>
@@ -169,7 +223,7 @@
                 </div>
             </div>
             <div class="items div-wsyl" style="display: none;">
-                <div class="cont" style="left: 58px;bottom: 146px;">
+                <!-- <div class="cont" style="left: 58px;bottom: 146px;">
                     <div class="detail" style="background-image: url(images/bg-1.png);">
                         <ul class="list ylfirst">
                             <li><span>医疗卫生机构数：</span><span>628</span></li>
@@ -208,7 +262,29 @@
                         </ul>
                     </div>
                     <img src="images/content_tipthree.png" alt="">
+                </div> -->
+                <ul class="title">
+                    <li class="list select" data-type="1" id="zdsh">医疗机构、床位数</li>
+                    <li class="list" data-type="2">医疗卫生人员</li>
+                    <li class="list" data-type="3">诊疗人数</li>
+                </ul>
+                <div class="yljgcws">
+                    <div class="left">
+                        <div id="wsylchar"></div>
+                    </div>
+                    <div class="right">
+                        <div>
+                            <div class="title">2021</div>
+                            <div id="other1"></div>
+                        </div>
+                        <div>
+                            <div class="title">2022</div>
+                            <div id="other2"></div>
+                        </div>
+                    </div>
                 </div>
+                <div class="ylry" id="ylryEchar"></div>
+                <div class="zlrs" id="zlrsEchar"></div>
             </div>
             <div class="items div-shjz" style="display: none;">
                 <ul class="title">
@@ -218,8 +294,32 @@
                 </ul>
                 <div id="shjzEchar"></div>
             </div>
+            <div class="items div-jyly" style="display: none;">
+                <div class="year" style="position: relative;">
+                    <span>年份：</span>
+                    <select id="yearl">
+                        <option value="2019">2019年</option>
+                        <option value="2020">2020年</option>
+                        <option value="2021">2021年</option>
+                    </select>
+                    <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
+                </div>
+                <div class="title">学生人数与学校数统计</div>
+                <div id="jylyPerEchar"></div>
+                <div id="jylySchoolEchar"></div>
+                <div class="other">
+                    <div class="title">学前教育其他数据</div>
+                    <ul class="itemData">
+
+                    </ul>
+                </div>
+                <div class="jylyTable" id="jylyTableM">
+
+                </div>
+            </div>
         </div>
     </div>
+    </div>
     <div style="width:100%;" id="footer"></div>
 </body>
 <script src="js/jquery-3.5.1.min.js"></script>
@@ -227,11 +327,13 @@
 <!-- 社会保障数据js -->
 <script src="js/socialSecurity.js"></script>
 <!-- 社会救助数据js -->
-<script src="js/socialAssistance.js"></script>
+<script src="js/socialAssistanceMobile.js"></script>
 <!-- 文化文旅数据js -->
 <script src="js/culturalTourism.js"></script>
 <!-- 卫生医疗数据js -->
-<script src="js/healthCare.js"></script>
+<script src="js/healthCareNewMobile.js"></script>
+<!-- 教育领域数据js -->
+<script src="js/education.js"></script>
 <script>
     // 判断进入的参数值
     function GetQueryString(name) {
@@ -248,16 +350,19 @@
     } else if (type == 2) {
         tapsIndex = 1;
         culturalTourism();
-        $('.year').css('display', 'none');
     }
     else if (type == 3) {
         tapsIndex = 2;
-        healthCare();
+        healthCareNew();
     }
     else if (type == 4) {
         tapsIndex = 3;
         socialAssistance();
-        $('.year').css('display', 'none');
+    }
+    else if (type == 5) {
+        tapsIndex = 4;
+        education();
+        document.getElementById('menu').scrollLeft = 300;
     }
     var tapsContItem = $('.content .items');
     var tabsArrow = $('.menu .tabs .arrow');
@@ -298,11 +403,6 @@
         // 导航栏切换
         var tapsIndex = 0;
         $('.menu .tabs').on('click', 'li', function () {
-            if ($(this)[0].outerText == "社会救助" || ($(this)[0].outerText == "文化旅游")) {
-                $('.year').css('display', 'none');
-            } else {
-                $('.year').css('display', 'flex');
-            }
             var tapsContItem = $('.content .items');
             var tapsTitleLi = $('.menu .tabs li');
             var tabsImg = $('.menu .tabs img');
@@ -318,9 +418,11 @@
                     } else if (index == 1) {
                         culturalTourism();
                     } else if (index == 2) {
-                        healthCare();
+                        healthCareNew();
                     } else if (index == 3) {
                         socialAssistance();
+                    } else if (index == 4) {
+                        education();
                     }
                 }
             });
@@ -356,6 +458,13 @@
         tapsTitleLi.removeClass('select');
         $(this).addClass('select');
     })
+
+    //卫生医疗菜单导航
+    $('.div-wsyl .title').on('click', 'li', function () {
+        var tapsTitleLi = $('.div-wsyl .title li');
+        tapsTitleLi.removeClass('select');
+        $(this).addClass('select');
+    })
 </script>
 <script>
     setHeader()

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

@@ -4,7 +4,7 @@ function culturalTourism() {
     $('.thisMonth').addClass('click');
     var shbzTableHtml = `
         <ul class="title">
-        <li style="width: 100px;">范围</li>
+        <li style="width: 101px;">范围</li>
         <li><span>旅游总收入</span><span>（万元）</span></li>
         <li><span>旅游从业人数</span><span>（人）</span></li>
         </ul>
@@ -54,11 +54,10 @@ function culturalTourism() {
                             style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
                         `+ params[1].value.toLocaleString() + `人次</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>
                 </div>`
                 return html;
-            }
+            },
+            confine: true
         },
         xAxis: {
             type: 'category',
@@ -132,7 +131,7 @@ function culturalTourism() {
         $('.thisMonth').addClass('click');
         var shbzTableHtml = `
         <ul class="title">
-        <li style="width: 100px;">范围</li>
+        <li style="width: 101px;">范围</li>
         <li><span>旅游总收入</span><span>（万元）</span></li>
         <li><span>旅游从业人数</span><span>（人）</span></li>
         </ul>
@@ -179,11 +178,10 @@ function culturalTourism() {
                             style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
                         `+ params[1].value.toLocaleString() + `人次</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>
                 </div>`
                     return html;
-                }
+                },
+                confine: true
             },
             xAxis: {
                 type: 'category',
@@ -257,7 +255,7 @@ function culturalTourism() {
         $('.thisMonth').removeClass('click');
         var shbzTableHtml = `
         <ul class="title">
-        <li style="width: 100px;">范围</li>
+        <li style="width: 101px;">范围</li>
         <li><span>旅游总收入</span><span>（万元）</span></li>
         <li><span>旅游从业人数</span><span>（人）</span></li>
         </ul>
@@ -305,11 +303,10 @@ function culturalTourism() {
                             style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
                         `+ params[1].value.toLocaleString() + `人次</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>
                 </div>`
                     return html;
-                }
+                },
+                confine: true
             },
             xAxis: {
                 type: 'category',

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

@@ -0,0 +1,712 @@
+function education() {
+    var jsonData = [{
+        "year": "2019",
+        "student": [
+            ['product', '幼儿人数', '小学人数', '初中人数', '高中人数'],
+            ['学生人数', 32826, 63718, 27674, 13423]
+        ],
+        "school": [
+            ['product', '幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中'],
+            ['学校数', 162, 42, 13, 6, 7]
+        ],
+        "zrjsrs": 2274,
+        "gbl": 40.2,
+        "hpl": 70.3,
+        "zj": 9370,
+        "lmh": 5483,
+        "hyly": 177,
+        "yykj": 316,
+        "jdgc": 3394
+    }, {
+        "year": "2020",
+        "student": [
+            ['product', '幼儿人数', '小学人数', '初中人数', '高中人数'],
+            ['学生人数', 36106, 67621, 29276, 13882]
+        ],
+        "school": [
+            ['product', '幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中'],
+            ['学校数', 176, 44, 11, 7, 8]
+        ],
+        "zrjsrs": 2449,
+        "gbl": 53.6,
+        "hpl": 83.7,
+        "zj": 9483,
+        "lmh": 5945,
+        "hyly": 256,
+        "yykj": 261,
+        "jdgc": 3021
+    }, {
+        "year": "2021",
+        "student": [
+            ['product', '幼儿人数', '小学人数', '初中人数', '高中人数'],
+            ['学生人数', 38575, 72732, 30308, 14758]
+        ],
+        "school": [
+            ['product', '幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中'],
+            ['学校数', 196, 45, 11, 8, 8]
+        ],
+        "zrjsrs": 2700,
+        "gbl": 53.8,
+        "hpl": 93.8,
+        "zj": 10732,
+        "lmh": 6311,
+        "hyly": 332,
+        "yykj": 295,
+        "jdgc": 3794
+    }]
+    // 初始化年份
+    document.getElementById("yearl").value = '2021';
+    // 学生人数
+    var chartDom = document.getElementById('jylyPerEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: {
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['幼儿人数', '小学人数', '初中人数', '高中人数']
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+        },
+        dataset: {
+            source: jsonData[2].student
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 80000,
+            interval: 20000,
+            axisLabel: {
+                formatter: '{value}(人)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 人';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#4DC4E7'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 人';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#27C2C1'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 人';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#51C070'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 人';
+                }
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 学校数
+    var chartDom = document.getElementById('jylySchoolEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: {
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中']
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+        },
+        dataset: {
+            source: jsonData[2].school
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 200,
+            interval: 50,
+            axisLabel: {
+                formatter: '{value}(所)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#FA8A46'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 所';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 所';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FA6639'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 所';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#46DEFA'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 所';
+                }
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#94C25B'
+            },
+            tooltip: {
+                valueFormatter: function (value) {
+                    return value + ' 所';
+                }
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+
+    // 其他数据
+    var shbzTableHtml = `
+    <li>
+    <img src="images/content_icon_teacher.png" alt="">
+    <div class="right">
+        <div>专任教师人数</div>
+        <div class="bottom">
+            <div class="number">`+ jsonData[2].zrjsrs + `</div>
+            <div class="unit">人</div>
+        </div>
+    </div>
+    </li>
+    <li>
+    <img src="images/content_icon_percentage.png" alt="">
+    <div class="right">
+        <div>公办园在园幼儿占比</div>
+        <div class="bottom">
+            <div class="number">`+ jsonData[2].gbl + `</div>
+            <div class="unit">%</div>
+        </div>
+    </div>
+    </li>
+    <li>
+    <img src="images/content_icon_cover.png" alt="">
+    <div class="right">
+        <div>普惠性幼儿园覆盖率</div>
+        <div class="bottom">
+            <div class="number">`+ jsonData[2].hpl + `</div>
+            <div class="unit">%</div>
+        </div>
+    </div>
+    </li>
+                    `
+    $(".other .itemData").empty().html(shbzTableHtml)
+
+    // 职成教科
+    var zcjkHtml = `<div class="title">中职在校学生人数(职成教科)</div>
+    <ul class="titleList">
+        <li style="width: 361px;">总计（人）</li>
+        <li>重庆市龙门浩职业中学校（人）</li>
+        <li>重庆航运旅游学校（人）</li>
+        <li>重庆市医药科技学校（人）</li>
+        <li>重庆市机电工程高级技工学校（人）</li>
+    </ul>
+    <ul class="number">
+        <li style="width: 360px;">`+ jsonData[2].zj + `</li>
+        <li>`+ jsonData[2].lmh + `</li>
+        <li>`+ jsonData[2].hyly + `</li>
+        <li>`+ jsonData[2].yykj + `</li>
+        <li>`+ jsonData[2].jdgc + `</li>
+    </ul>`
+    $(".jylyTable").empty().html(zcjkHtml)
+    // 移动端表格
+    var zcjkHtmlM = `<div class="title" style="margin-top:30px;">中职在校学生人数(职成教科)</div>
+    <ul class="titleList">
+        <li style="width: 361px;">总计（人）</li>
+        <li><span>重庆市龙门浩职</span><span>业中学校（人）</span></li>
+        <li><span>重庆航运旅游</span><span>学校（人）</span></li>
+    </ul>
+    <ul class="number">
+        <li style="width: 360px;">`+ jsonData[2].zj + `</li>
+        <li>`+ jsonData[2].lmh + `</li>
+        <li>`+ jsonData[2].hyly + `</li>
+    </ul>
+    <ul class="titleList">
+        <li><span>重庆市医药科技</span><span>学校（人）</span></li>
+        <li><span>重庆市机电工程高级</span><span>技工学校（人）</span></li>
+    </ul>
+    <ul class="number">
+        <li>`+ jsonData[2].yykj + `</li>
+        <li>`+ jsonData[2].jdgc + `</li>
+    </ul>`
+    $("#jylyTableM").empty().html(zcjkHtmlM)
+    $('#yearl').on('change', function () {
+        var value = $(this).val();
+        for (var i = 0; i < jsonData.length; i++) {
+            if (jsonData[i].year == value) {
+                // 学生人数
+                var chartDom = document.getElementById('jylyPerEchar');
+                var myChart = echarts.init(chartDom);
+                var option;
+                option = {
+                    grid: {
+                        // 网格线配置
+                        show: true,
+                        lineStyle: {
+                            color: ["#e9e9e9"],
+                            width: 1,
+                            type: "solid",
+                        },
+                        left: 100
+                    },
+                    legend: {
+                        itemWidth: 12,
+                        itemHeight: 10,
+                        data: ['幼儿人数', '小学人数', '初中人数', '高中人数']
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        },
+                        backgroundColor: "rgb(0 0 0 / 40%)",
+                        borderColor: 'transparent',
+                        textStyle: {
+                            color: '#fff'
+                        },
+                    },
+                    dataset: {
+                        source: jsonData[i].student
+                    },
+                    xAxis: {
+                        type: 'category',
+                        axisTick: {
+                            show: true  //坐标轴刻度线
+                        },
+                        axisLine: { //轴线
+                            show: true
+                        },
+                        splitLine: { //网格线
+                            show: true
+                        },
+                        axisLabel: {
+                            show: true,
+                            textStyle: {
+                                color: '#333',  //更改坐标轴文字颜色
+                                fontSize: 14,      //更改坐标轴文字大小
+                                fontWeight: 'bold'
+                            }
+                        }
+                    },
+                    yAxis: [{
+                        type: 'value',
+                        min: 0,
+                        max: 80000,
+                        interval: 20000,
+                        axisLabel: {
+                            formatter: '{value}(人)'
+                        },
+                        axisTick: {
+                            show: true  //坐标轴刻度线
+                        },
+                        axisLine: { //轴线
+                            show: true
+                        },
+                        splitLine: { //网格线
+                            show: true
+                        }
+                    }],
+                    series: [{
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#3C8DE6'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 人';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#4DC4E7'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 人';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#27C2C1'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 人';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#51C070'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 人';
+                            }
+                        }
+                    }
+                    ]
+                };
+                option && myChart.setOption(option);
+                // 学校数
+                var chartDom = document.getElementById('jylySchoolEchar');
+                var myChart = echarts.init(chartDom);
+                var option;
+                option = {
+                    grid: {
+                        // 网格线配置
+                        show: true,
+                        lineStyle: {
+                            color: ["#e9e9e9"],
+                            width: 1,
+                            type: "solid",
+                        },
+                        left: 100
+                    },
+                    legend: {
+                        itemWidth: 12,
+                        itemHeight: 10,
+                        data: ['幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中']
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        },
+                        backgroundColor: "rgb(0 0 0 / 40%)",
+                        borderColor: 'transparent',
+                        textStyle: {
+                            color: '#fff'
+                        },
+                    },
+                    dataset: {
+                        source: jsonData[i].school
+                    },
+                    xAxis: {
+                        type: 'category',
+                        axisTick: {
+                            show: true  //坐标轴刻度线
+                        },
+                        axisLine: { //轴线
+                            show: true
+                        },
+                        splitLine: { //网格线
+                            show: true
+                        },
+                        axisLabel: {
+                            show: true,
+                            textStyle: {
+                                color: '#333',  //更改坐标轴文字颜色
+                                fontSize: 14,      //更改坐标轴文字大小
+                                fontWeight: 'bold'
+                            }
+                        }
+                    },
+                    yAxis: [{
+                        type: 'value',
+                        min: 0,
+                        max: 200,
+                        interval: 50,
+                        axisLabel: {
+                            formatter: '{value}(所)'
+                        },
+                        axisTick: {
+                            show: true  //坐标轴刻度线
+                        },
+                        axisLine: { //轴线
+                            show: true
+                        },
+                        splitLine: { //网格线
+                            show: true
+                        }
+                    }],
+                    series: [{
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#FA8A46'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 所';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#FAA639'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 所';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#FA6639'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 所';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#46DEFA'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 所';
+                            }
+                        }
+                    },
+                    {
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#94C25B'
+                        },
+                        tooltip: {
+                            valueFormatter: function (value) {
+                                return value + ' 所';
+                            }
+                        }
+                    }
+                    ]
+                };
+                option && myChart.setOption(option);
+
+                // 其他数据
+                var shbzTableHtml = `
+                <li>
+                <img src="images/content_icon_teacher.png" alt="">
+                <div class="right">
+                    <div>专任教师人数</div>
+                    <div class="bottom">
+                        <div class="number">`+ jsonData[i].zrjsrs + `</div>
+                        <div class="unit">人</div>
+                    </div>
+                </div>
+                </li>
+                <li>
+                <img src="images/content_icon_percentage.png" alt="">
+                <div class="right">
+                    <div>公办园在园幼儿占比</div>
+                    <div class="bottom">
+                        <div class="number">`+ jsonData[i].gbl + `</div>
+                        <div class="unit">%</div>
+                    </div>
+                </div>
+                </li>
+                <li>
+                <img src="images/content_icon_cover.png" alt="">
+                <div class="right">
+                    <div>普惠性幼儿园覆盖率</div>
+                    <div class="bottom">
+                        <div class="number">`+ jsonData[i].hpl + `</div>
+                        <div class="unit">%</div>
+                    </div>
+                </div>
+                </li>
+                                `
+                $(".other .itemData").empty().html(shbzTableHtml)
+
+                // 职成教科
+                var zcjkHtml = `<div class="title">中职在校学生人数(职成教科)</div>
+                <ul class="titleList">
+                    <li style="width: 361px;">总计（人）</li>
+                    <li>重庆市龙门浩职业中学校（人）</li>
+                    <li>重庆航运旅游学校（人）</li>
+                    <li>重庆市医药科技学校（人）</li>
+                    <li>重庆市机电工程高级技工学校（人）</li>
+                </ul>
+                <ul class="number">
+                    <li style="width: 360px;">`+ jsonData[i].zj + `</li>
+                    <li>`+ jsonData[i].lmh + `</li>
+                    <li>`+ jsonData[i].hyly + `</li>
+                    <li>`+ jsonData[i].yykj + `</li>
+                    <li>`+ jsonData[i].jdgc + `</li>
+                </ul>`
+                $(".jylyTable").empty().html(zcjkHtml)
+                // 移动端表格
+                var zcjkHtmlM = `<div class="title" style="margin-top:30px;">中职在校学生人数(职成教科)</div>
+                <ul class="titleList">
+                    <li style="width: 361px;">总计（人）</li>
+                    <li><span>重庆市龙门浩职</span><span>业中学校（人）</span></li>
+                    <li><span>重庆航运旅游</span><span>学校（人）</span></li>
+                </ul>
+                <ul class="number">
+                    <li style="width: 360px;">`+ jsonData[i].zj + `</li>
+                    <li>`+ jsonData[i].lmh + `</li>
+                    <li>`+ jsonData[i].hyly + `</li>
+                </ul>
+                <ul class="titleList">
+                    <li><span>重庆市医药科技</span><span>学校（人）</span></li>
+                    <li><span>重庆市机电工程高级</span><span>技工学校（人）</span></li>
+                </ul>
+                <ul class="number">
+                    <li>`+ jsonData[i].yykj + `</li>
+                    <li>`+ jsonData[i].jdgc + `</li>
+                </ul>`
+                $("#jylyTableM").empty().html(zcjkHtmlM)
+            }
+        }
+    })
+}

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

@@ -0,0 +1,458 @@
+function healthCareNew() {
+
+    var jsonData1 = [
+        ['product', '医疗卫生机构床位数(个)', '医院、卫生院床位数(个)', '保健院床位数(个)'],
+        ['2021年', 7208, 7178, 30],
+        ['2022年', 7255, 7225, 30]
+    ]
+    var jsonData2 = [
+        ['product', '卫生技术人员（人）', '执业（助理）医师（人）', '注册护士（人）', '每千人口执业(助理)医师（人）', '每千人口注册护士（人）'],
+        ['2021年', 10856, 4267, 6589, 3.36, 5.19],
+        ['2022年', 10981, 4299, 6682, 3.59, 5.58]
+    ]
+    var jsonData3 = [
+        ['product', '总诊疗人次（万人次）', '门急诊人次（万人次）', '入院人次（万人次）', '出院人次（万人次）'],
+        ['2021年', 288.2, 280.0, 11.3, 11.3],
+        ['2022年', 278.5, 265.9, 8.0, 8.0]
+    ]
+    //机构数、床位数
+    //柱状图
+    var chartDom = document.getElementById('wsylchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+    var tapsTitleLi = $('.div-wsyl .title li');
+    tapsTitleLi.removeClass('select');
+    $("#zdsh").addClass('select')
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: [{
+            left: '20%',
+            orient: 'vertical',
+            data: ['医疗卫生机构床位数(个)', '医院、卫生院床位数(个)']
+        },
+        {
+            left: '60%',
+            orient: 'vertical',
+            data: ['保健院床位数(个)']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+
+        },
+        dataset: {
+            source: jsonData1
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 8000,
+            axisLabel: {
+                formatter: '{value}(个)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#0084C8'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#D8514B'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 饼状图
+    var chartDom = document.getElementById('other1');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            orient: 'vertical',
+            left: '70%',
+            top: '30%',
+            // data: ['医疗卫生机构数（个）', '医院（个）', '卫生院（个）', '社区卫生服务中心/站（个）', '疾控中心（个）', '妇幼保健院（个）']
+        },
+        series: [
+            {
+                type: 'pie',
+                radius: '50%',
+                center: ['35%', '50%'],
+                data: [
+                    { value: 682, name: '医疗卫生机构数（个）' },
+                    { value: 46, name: '医院（个）' },
+                    { value: 7, name: '卫生院（个）' },
+                    { value: 1, name: '妇幼保健院（个）' },
+                    { value: 1, name: '疾控中心（个）' },
+                    { value: 46, name: '社区卫生服务中心/站（个）' }
+                ],
+                emphasis: {
+                    itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                    }
+                },
+                label: {
+                    normal: {
+                        show: true,
+                        formatter: '{b}:{c}'
+                    }
+                }
+            }
+        ]
+    };
+    option && myChart.setOption(option);
+    var chartDom = document.getElementById('other2');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            orient: 'vertical',
+            left: '70%',
+            top: '30%'
+        },
+        series: [
+            {
+                type: 'pie',
+                radius: '50%',
+                center: ['35%', '50%'],
+                data: [
+                    { value: 705, name: '医疗卫生机构数（个）' },
+                    { value: 45, name: '医院（个）' },
+                    { value: 7, name: '卫生院（个）' },
+                    { value: 1, name: '妇幼保健院（个）' },
+                    { value: 1, name: '疾控中心（个）' },
+                    { value: 46, name: '社区卫生服务中心/站（个）' }
+                ],
+                emphasis: {
+                    itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                    }
+                },
+                label: {
+                    normal: {
+                        show: true,
+                        formatter: '{b}:{c}'
+                    }
+                }
+            }
+        ]
+    };
+    option && myChart.setOption(option);
+
+    // 医疗卫生人员
+    var chartDom = document.getElementById('ylryEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: [{
+            left: '20%',
+            orient: 'vertical',
+            data: ['卫生技术人员（人）', '执业（助理）医师（人）']
+        },
+        {
+            left: '40%',
+            orient: 'vertical',
+            data: ['注册护士（人）', '每千人口执业(助理)医师（人）']
+        },
+        {
+            left: '60%',
+            orient: 'vertical',
+            data: ['每千人口注册护士（人）']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+
+        },
+        dataset: {
+            source: jsonData2
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 12000,
+            axisLabel: {
+                formatter: '{value}(个)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        {
+            type: 'value',
+            min: 0,
+            max: 6,
+            axisLabel: {
+                formatter: '{value}(人)'
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 诊疗人员
+    var chartDom = document.getElementById('zlrsEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: {
+            data: ['总诊疗人次（万人次）', '门急诊人次（万人次）', '入院人次（万人次）', '出院人次（万人次）']
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+
+        },
+        dataset: {
+            source: jsonData3
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 300,
+            axisLabel: {
+                formatter: '{value}(万人次)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    $('.yljgcws').show()
+    $('.ylry').hide()
+    $('.zlrs').hide()
+    $('.div-wsyl .title').on('click', 'li', function () {
+        if ($(this).data('type') == 1) {
+            $('.yljgcws').show()
+            $('.ylry').hide()
+            $('.zlrs').hide()
+        } else if ($(this).data('type') == 2) {
+            $('.yljgcws').hide()
+            $('.ylry').show()
+            $('.zlrs').hide()
+        } else if ($(this).data('type') == 3) {
+            $('.yljgcws').hide()
+            $('.ylry').hide()
+            $('.zlrs').show()
+        }
+    })
+
+}

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

@@ -0,0 +1,473 @@
+function healthCareNew() {
+
+    var jsonData1 = [
+        ['product', '医疗卫生机构床位数(个)', '医院、卫生院床位数(个)', '保健院床位数(个)'],
+        ['2021年', 7208, 7178, 30],
+        ['2022年', 7255, 7225, 30]
+    ]
+    var jsonData2 = [
+        ['product', '卫生技术人员（人）', '执业（助理）医师（人）', '注册护士（人）', '每千人口执业(助理)医师（人）', '每千人口注册护士（人）'],
+        ['2021年', 10856, 4267, 6589, 3.36, 5.19],
+        ['2022年', 10981, 4299, 6682, 3.59, 5.58]
+    ]
+    var jsonData3 = [
+        ['product', '总诊疗人次（万人次）', '门急诊人次（万人次）', '入院人次（万人次）', '出院人次（万人次）'],
+        ['2021年', 288.2, 280.0, 11.3, 11.3],
+        ['2022年', 278.5, 265.9, 8.0, 8.0]
+    ]
+    //机构数、床位数
+    //柱状图
+    var chartDom = document.getElementById('wsylchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+    var tapsTitleLi = $('.div-wsyl .title li');
+    tapsTitleLi.removeClass('select');
+    $("#zdsh").addClass('select')
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: [{
+            left: '10%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['医疗卫生机构床位数(个)', '医院、卫生院床位数(个)']
+        },
+        {
+            left: '60%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['保健院床位数(个)']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true 
+
+        },
+        dataset: {
+            source: jsonData1
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 8000,
+            axisLabel: {
+                formatter: '{value}(个)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#0084C8'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#D8514B'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 饼状图
+    var chartDom = document.getElementById('other1');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    option = {
+        tooltip: {
+            trigger: 'item',
+            confine: true 
+        },
+        legend: {
+            orient: 'vertical',
+            left: '30%',
+            top: '60%',
+            itemWidth: 12,
+            itemHeight: 10,
+            // data: ['医疗卫生机构数（个）', '医院（个）', '卫生院（个）', '社区卫生服务中心/站（个）', '疾控中心（个）', '妇幼保健院（个）']
+        },
+        series: [
+            {
+                type: 'pie',
+                radius: '50%',
+                center: ['50%', '30%'],
+                data: [
+                    { value: 682, name: '医疗卫生机构数（个）' },
+                    { value: 46, name: '医院（个）' },
+                    { value: 7, name: '卫生院（个）' },
+                    { value: 1, name: '妇幼保健院（个）' },
+                    { value: 1, name: '疾控中心（个）' },
+                    { value: 46, name: '社区卫生服务中心/站（个）' }
+                ],
+                emphasis: {
+                    itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                    }
+                },
+                label: {
+                    normal: {
+                        show: true,
+                        formatter: '{b}:{c}'
+                    }
+                }
+            }
+        ]
+    };
+    option && myChart.setOption(option);
+    var chartDom = document.getElementById('other2');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    option = {
+        tooltip: {
+            trigger: 'item',
+            confine: true 
+        },
+        legend: {
+            orient: 'vertical',
+            left: '30%',
+            top: '60%',
+            itemWidth: 12,
+            itemHeight: 10,
+        },
+        series: [
+            {
+                type: 'pie',
+                radius: '50%',
+                center: ['50%', '30%'],
+                data: [
+                    { value: 705, name: '医疗卫生机构数（个）' },
+                    { value: 45, name: '医院（个）' },
+                    { value: 7, name: '卫生院（个）' },
+                    { value: 1, name: '妇幼保健院（个）' },
+                    { value: 1, name: '疾控中心（个）' },
+                    { value: 46, name: '社区卫生服务中心/站（个）' }
+                ],
+                emphasis: {
+                    itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                    }
+                },
+                label: {
+                    normal: {
+                        show: true,
+                        formatter: '{b}:{c}'
+                    }
+                }
+            }
+        ]
+    };
+    option && myChart.setOption(option);
+
+    // 医疗卫生人员
+    var chartDom = document.getElementById('ylryEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100,
+            top:'15%'
+        },
+        legend: [{
+            left: '5%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['卫生技术人员（人）', '执业（助理）医师（人）', '每千人口执业(助理)医师（人）']
+        },
+        {
+            left: '55%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['注册护士（人）','每千人口注册护士（人）']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true 
+
+        },
+        dataset: {
+            source: jsonData2
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 12000,
+            axisLabel: {
+                formatter: '{value}(个)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        {
+            type: 'value',
+            min: 0,
+            max: 6,
+            axisLabel: {
+                formatter: '{value}(人)'
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 诊疗人员
+    var chartDom = document.getElementById('zlrsEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        legend: {
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['总诊疗人次（万人次）', '门急诊人次（万人次）', '入院人次（万人次）', '出院人次（万人次）']
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true
+
+        },
+        dataset: {
+            source: jsonData3
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 300,
+            axisLabel: {
+                formatter: '{value}(万人次)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        }
+        ]
+    };
+    option && myChart.setOption(option);
+    $('.yljgcws').show()
+    $('.ylry').hide()
+    $('.zlrs').hide()
+    $('.div-wsyl .title').on('click', 'li', function () {
+        if ($(this).data('type') == 1) {
+            $('.yljgcws').show()
+            $('.ylry').hide()
+            $('.zlrs').hide()
+        } else if ($(this).data('type') == 2) {
+            $('.yljgcws').hide()
+            $('.ylry').show()
+            $('.zlrs').hide()
+        } else if ($(this).data('type') == 3) {
+            $('.yljgcws').hide()
+            $('.ylry').hide()
+            $('.zlrs').show()
+        }
+    })
+
+}

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

@@ -1,7 +1,7 @@
 function socialAssistance() {
 
     var jsonData1 = [
-        ['product', '最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)', '农村居民最低生活保障人数（人)', '农村居民发放低保金(万元)'],
+        ['product', '最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)', '农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)'],
         ['2015年', 11582, 5820.90, 10289, 5387.60, 1293, 433.30],
         ['2016年', 10577, 6109.90, 9446, 5661.10, 1131, 448.80],
         ['2017年', 10633, 6691.90, 9515, 6146.70, 1118, 545.20],
@@ -34,10 +34,9 @@ function socialAssistance() {
     var chartDom = document.getElementById('shjzEchar');
     var myChart = echarts.init(chartDom);
     var option;
-    var tapsTitleLi = $('.div-shjz .title li');
-    tapsTitleLi.removeClass('select');
-    // console.log(tapsTitleLi)
-    $("#zdsh").addClass('select')
+    // var tapsTitleLi = $('.div-shjz .title li');
+    // tapsTitleLi.removeClass('select');
+    // $("#zdsh").addClass('select')
 
     myChart.clear();
     option = {
@@ -62,7 +61,7 @@ function socialAssistance() {
         }, {
             left: '60%',
             orient: 'vertical',
-            data: ['农村居民最低生活保障人数（人)', '农村居民发放低保金(万元)']
+            data: ['农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)']
         }
         ],
         tooltip: {
@@ -103,7 +102,7 @@ function socialAssistance() {
         yAxis: [{
             type: 'value',
             min: 0,
-            max: 15000,
+            max: 12000,
             interval: 3000,
             axisLabel: {
                 formatter: '{value}(人)'
@@ -121,7 +120,7 @@ function socialAssistance() {
         {
             type: 'value',
             min: 0,
-            max: 10000,
+            max: 8000,
             interval: 2000,
             axisLabel: {
                 formatter: '{value}(万元)'
@@ -194,7 +193,7 @@ function socialAssistance() {
                 }, {
                     left: '60%',
                     orient: 'vertical',
-                    data: ['农村居民最低生活保障人数（人)', '农村居民发放低保金(万元)']
+                    data: ['农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)']
                 }
                 ],
                 tooltip: {
@@ -234,7 +233,7 @@ function socialAssistance() {
                 yAxis: [{
                     type: 'value',
                     min: 0,
-                    max: 15000,
+                    max: 12000,
                     interval: 3000,
                     axisLabel: {
                         formatter: '{value}(人)'
@@ -252,7 +251,7 @@ function socialAssistance() {
                 {
                     type: 'value',
                     min: 0,
-                    max: 10000,
+                    max: 8000,
                     interval: 2000,
                     axisLabel: {
                         formatter: '{value}(万元)'
@@ -364,7 +363,7 @@ function socialAssistance() {
                 yAxis: [{
                     type: 'value',
                     min: 0,
-                    max: 500,
+                    max: 400,
                     interval: 50,
                     axisLabel: {
                         formatter: '{value}(人)'
@@ -382,7 +381,7 @@ function socialAssistance() {
                 {
                     type: 'value',
                     min: 0,
-                    max: 1200,
+                    max: 960,
                     interval: 120,
                     axisLabel: {
                         formatter: '{value}(万元)'
@@ -458,7 +457,6 @@ function socialAssistance() {
                     textStyle: {
                         color: '#fff'
                     },
-
                 },
                 dataset: {
                     source: jsonData3
@@ -485,7 +483,7 @@ function socialAssistance() {
                 yAxis: [{
                     type: 'value',
                     min: 0,
-                    max: 8000,
+                    max: 7000,
                     interval: 1000,
                     axisLabel: {
                         formatter: '{value}(人)'
@@ -503,7 +501,7 @@ function socialAssistance() {
                 {
                     type: 'value',
                     min: 0,
-                    max: 1200,
+                    max: 1050,
                     interval: 150,
                     axisLabel: {
                         formatter: '{value}(万元)'

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

@@ -0,0 +1,546 @@
+function socialAssistance() {
+
+    var jsonData1 = [
+        ['product', '最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)', '农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)'],
+        ['2015年', 11582, 5820.90, 10289, 5387.60, 1293, 433.30],
+        ['2016年', 10577, 6109.90, 9446, 5661.10, 1131, 448.80],
+        ['2017年', 10633, 6691.90, 9515, 6146.70, 1118, 545.20],
+        ['2018年', 10044, 7345.30, 8994, 6710.60, 1050, 634.70],
+        ['2019年', 8960, 6939.10, 8070, 6365.80, 890, 573.30],
+        ['2020年', 8297, 7853.00, 7496, 7216.00, 801, 637.00],
+        ['2021年', 7467, 5800.80, 6792, 5317.40, 675, 483.40]
+    ]
+    var jsonData2 = [
+        ['product', '特困人员救助供养人数（人）', '发放救助金供养金（万元）', '城市特困人员救助供养人数（人）', '城市发放救助供养金（万元）', '农村特困人员救助供养人数（人）', '农村发放救助供养金（万元）'],
+        ['2015年', 208, 573.10, 106, 264.00, 102, 309.10],
+        ['2016年', 365, 415.70, 113, 115.50, 252, 300.20],
+        ['2017年', 349, 431.80, 116, 191.40, 233, 240.40],
+        ['2018年', 351, 503.00, 131, 228.50, 220, 274.50],
+        ['2019年', 381, 495.00, 162, 238.00, 219, 257.00],
+        ['2020年', 349, 330.80, 142, 330.80, 207, 309.00],
+        ['2021年', 352, 654.10, 167, 384.60, 185, 269.50]
+    ]
+    var jsonData3 = [
+        ['product', '临时救助人数（人）', '发放金额（万元）'],
+        ['2015年', 6064, 411.70],
+        ['2016年', 3544, 915.70],
+        ['2017年', 2888, 877.50],
+        ['2018年', 2677, 743.50],
+        ['2019年', 1412, 813.70],
+        ['2020年', 1412, 827.70],
+        ['2021年', 1264, 680.60]
+    ]
+    //社会救助统计图
+    var chartDom = document.getElementById('shjzEchar');
+    var myChart = echarts.init(chartDom);
+    var option;
+    // var tapsTitleLi = $('.div-shjz .title li');
+    // tapsTitleLi.removeClass('select');
+    // console.log($("#zdsh"))
+    // $("#zdsh").addClass('select')
+
+    myChart.clear();
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 80,
+            right: 80,
+            top: '15%'
+        },
+        legend: [{
+            left: '0%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+        },
+        {
+            left: '40%',
+            orient: 'vertical',
+            itemWidth: 12,
+            itemHeight: 10,
+            data: ['农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true
+
+        },
+        dataset: {
+            source: jsonData1
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14,      //更改坐标轴文字大小
+                    fontWeight: 'bold'
+                }
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 12000,
+            interval: 3000,
+            axisLabel: {
+                formatter: '{value}(人)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        {
+            type: 'value',
+            min: 0,
+            max: 8000,
+            interval: 2000,
+            axisLabel: {
+                formatter: '{value}(万元)'
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            yAxisIndex: 1,
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#4DC4E7'
+            }
+        },
+        ]
+    };
+    option && myChart.setOption(option);
+
+    $('.div-shjz .title').on('click', 'li', function () {
+        if ($(this).data('type') == 1) {
+            option = {
+                grid: {
+                    // 网格线配置
+                    show: true,
+                    lineStyle: {
+                        color: ["#e9e9e9"],
+                        width: 1,
+                        type: "solid",
+                    },
+                    left: 80,
+                    right: 80,
+                    top: '15%'
+                },
+                legend: [{
+                    left: '0%',
+                    orient: 'vertical',
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    data: ['最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+                },
+                {
+                    left: '50%',
+                    orient: 'vertical',
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    data: ['农村居民发放低保金(万元)', '农村居民最低生活保障人数(人)']
+                }
+                ],
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    },
+                    backgroundColor: "rgb(0 0 0 / 40%)",
+                    borderColor: 'transparent',
+                    textStyle: {
+                        color: '#fff'
+                    },
+                    confine: true
+
+                },
+                dataset: {
+                    source: jsonData1
+                },
+                xAxis: {
+                    type: 'category',
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    },
+                    axisLabel: {
+                        show: true,
+                        textStyle: {
+                            color: '#333',  //更改坐标轴文字颜色
+                            fontSize: 14      //更改坐标轴文字大小
+                        }
+                    }
+                },
+                yAxis: [{
+                    type: 'value',
+                    min: 0,
+                    max: 12000,
+                    interval: 3000,
+                    axisLabel: {
+                        formatter: '{value}(人)'
+                    },
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    }
+                },
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 8000,
+                    interval: 2000,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
+                series: [{
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#3C8DE6'
+                    }
+                },
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#8EC051'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#27C2C1'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FA8A46'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#4DC4E7'
+                    }
+                },
+                ]
+            };
+            myChart.clear();
+            option && myChart.setOption(option);
+        } else if ($(this).data('type') == 2) {
+            option = {
+                grid: {
+                    // 网格线配置
+                    show: true,
+                    lineStyle: {
+                        color: ["#e9e9e9"],
+                        width: 1,
+                        type: "solid",
+                    },
+                    left: 80,
+                    right: 80,
+                    top: '15%'
+                },
+                legend: [{
+                    left: '0%',
+                    orient: 'vertical',
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    data: ['特困人员救助供养人数（人）', '发放救助金供养金（万元）', '城市特困人员救助供养人数（人）', '农村特困人员救助供养人数（人）']
+                },
+                {
+                    left: '50%',
+                    orient: 'vertical',
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    data: ['城市发放救助供养金（万元）', '农村发放救助供养金（万元）']
+                }
+                ],
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    },
+                    backgroundColor: "rgb(0 0 0 / 40%)",
+                    borderColor: 'transparent',
+                    textStyle: {
+                        color: '#fff'
+                    },
+                    confine: true
+
+                },
+                dataset: {
+                    source: jsonData2
+                },
+                xAxis: {
+                    type: 'category',
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    },
+                    axisLabel: {
+                        show: true,
+                        textStyle: {
+                            color: '#333',  //更改坐标轴文字颜色
+                            fontSize: 14      //更改坐标轴文字大小
+                        }
+                    }
+                },
+                yAxis: [{
+                    type: 'value',
+                    min: 0,
+                    max: 400,
+                    interval: 50,
+                    axisLabel: {
+                        formatter: '{value}(人)'
+                    },
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    }
+                },
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 960,
+                    interval: 120,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
+                series: [{
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#3C8DE6'
+                    }
+                },
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#8EC051'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#27C2C1'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FA8A46'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#4DC4E7'
+                    }
+                },
+                ]
+            };
+            myChart.clear();
+            option && myChart.setOption(option);
+        } else if ($(this).data('type') == 3) {
+            option = {
+                grid: {
+                    // 网格线配置
+                    show: true,
+                    lineStyle: {
+                        color: ["#e9e9e9"],
+                        width: 1,
+                        type: "solid",
+                    },
+                    left: 80,
+                    right: 80
+                },
+                legend: [{
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    data: ['临时救助人数（人）', '发放金额（万元）']
+                }
+                ],
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    },
+                    backgroundColor: "rgb(0 0 0 / 40%)",
+                    borderColor: 'transparent',
+                    textStyle: {
+                        color: '#fff'
+                    },
+                    confine: true
+                },
+                dataset: {
+                    source: jsonData3
+                },
+                xAxis: {
+                    type: 'category',
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    },
+                    axisLabel: {
+                        show: true,
+                        textStyle: {
+                            color: '#333',  //更改坐标轴文字颜色
+                            fontSize: 14      //更改坐标轴文字大小
+                        }
+                    }
+                },
+                yAxis: [{
+                    type: 'value',
+                    min: 0,
+                    max: 7000,
+                    interval: 1000,
+                    axisLabel: {
+                        formatter: '{value}(人)'
+                    },
+                    axisTick: {
+                        show: true  //坐标轴刻度线
+                    },
+                    axisLine: { //轴线
+                        show: true
+                    },
+                    splitLine: { //网格线
+                        show: true
+                    }
+                },
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 1050,
+                    interval: 150,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
+                series: [{
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#3C8DE6'
+                    }
+                },
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
+                }
+                ]
+            };
+            myChart.clear();
+            option && myChart.setOption(option);
+        }
+    })
+
+}

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

@@ -27,6 +27,10 @@ function socialSecurity() {
         "arbitratAward": 318,
         "closeRate": 87
     }]
+    
+    // 初始化年份
+    console.log(document.getElementById("year"))
+    document.getElementById("year").value='2022';
     $('#year').on('change', function () {
         var value = $(this).val();
         for (var i = 0; i < jsonData.length; i++) {
@@ -98,7 +102,7 @@ function socialSecurity() {
                     <div style="text-align: center;width:100%;font-size: 22px;color: #333333;margin: 20px auto;">劳动争议案件
                     </div>
                     <ul class="title">
-                        <li style="width: 200px;">年份</li>
+                        <li style="width: 201px;">年份</li>
                         <li><span>纠纷总数</span><span>（件）</span></li>
                         <li><span>涉及人数</span><span>（个）</span></li>
                         <li><span>结案数量</span><span>（件）</span></li>
@@ -119,7 +123,7 @@ function socialSecurity() {
                 <div style="text-align: center;width:100%;font-size: 20px;color: #333333;margin: 20px auto;">劳动争议案件
                     </div>
                     <ul class="title">
-                        <li>年份</li>
+                        <li style="width:121px;">年份</li>
                         <li><span>纠纷总数</span><span>（件）</span></li>
                         <li><span>涉及人数</span><span>（个）</span></li>
                     </ul>
@@ -129,7 +133,7 @@ function socialSecurity() {
                         <li>`+ jsonData[i].involvedPeople + `</li>
                     </ul>
                     <div class="title">
-                        <li><span>结案数量</span><span>（件）</span></li>
+                        <li style="width:121px;"><span>结案数量</span><span>（件）</span></li>
                         <li><span>仲裁裁决</span><span>（件）</span></li>
                         <li><span>结案率</span><span>（%）</span></li>
                     </div>

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

@@ -984,6 +984,13 @@
 <script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="js/south.js"></script>
 <script id="_trs_ta_js" src="//ta.trs.cn/c/js/ta.js?mpid=3973" async="async" defer="defer"></script>
+<!--<script>-->
+<!--    // PC端 移动端 跳转-->
+<!--    var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;-->
+<!--    if (is_mobi) {-->
+<!--        window.parent.location.href = "enter_showLightMobile.html";-->
+<!--    }-->
+<!--</script>-->
 <script>
     var data = '';
 

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

@@ -422,6 +422,12 @@
 		<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
 		<script src="js/enterStatisMain.js" type="text/javascript" charset="utf-8"></script>
 		<script id="_trs_ta_js" src="//ta.trs.cn/c/js/ta.js?mpid=3973" async="async" defer="defer"></script>
-
+<!--		<script>-->
+<!--			// PC端 移动端 跳转-->
+<!--			var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;-->
+<!--			if (is_mobi) {-->
+<!--				window.parent.location.href = "enter_showStatis_mobile.html";-->
+<!--			}-->
+<!--		</script>-->
 	</body>
 </html>

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

@@ -30,7 +30,7 @@
 			text-align: left;
 			font-family: RUIZIZHENYANTIMIANFEISHANGYONG;
 			color: #333;
-			font-size: 96px;
+			font-size: 60px;
 			background-color: #fff;
 			box-sizing: border-box;
 			width: 100%;
@@ -38,7 +38,6 @@
 			margin: auto
 		}
 		.logo div{
-			padding-left: 128px;
 			/* width: auto; */
 			margin: auto;
 		}
@@ -334,6 +333,14 @@
 		<div class="logo">
 			<div> 南岸区经济发展数据 </div>
 		</div>
+		<div class="showTime" style="position: inherit;margin-top: 31px;color: #0990F8;">
+			<div class="timeDeatil" style="line-height: 42px;">10:12:23</div>
+			<div class="dateLine" style="line-height: 42px;margin-right: 10px;">|</div>
+			<div>
+				<p class="dateMon">星期四</p>
+				<p class="dateDeatil">2021-09-12</p>
+			</div>
+		</div>
 	</div>