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

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

@@ -429,6 +429,7 @@
                         <option value="2021">2021年</option>
                         <option value="2022">2022年</option>
                         <option value="2023">2023年</option>
+                        <option value="2024">2024年</option>
                     </select>
                     <img src="images/arrow.png" alt="" style="position: absolute;right: 20px;">
                 </div>

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

@@ -133,6 +133,9 @@ function culturalTourism() {
   option && myChart.setOption(option);
 
   var chartDom = document.getElementById("gyykEchart");
+  if(!chartDom){
+    return
+  }
   var myChart = echarts.init(chartDom);
   myChart.clear();
   var alldata = [

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

@@ -133,6 +133,9 @@ function culturalTourism() {
   option && myChart.setOption(option);
 
   var chartDom = document.getElementById("gyykEchart");
+  if(!chartDom){
+    return
+  }
   var myChart = echarts.init(chartDom);
   myChart.clear();
   var alldata = [

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

@@ -89,9 +89,27 @@ function education() {
         "hyly": 332,
         "yykj": 295,
         "jdgc": 3794
+    },{
+        "year": "2024",
+        "student": [
+            ['product', '幼儿人数', '小学人数', '初中人数', '高中人数'],
+            ['学生人数', 35831, 81311, 30198, 15474]
+        ],
+        "school": [
+            ['product', '幼儿园', '小学', '单办初中', '九年一贯制学校', '高完中'],
+            ['学校数', 203, 55, 12, 8, 8]
+        ],
+        "zrjsrs": 2721,
+        "gbl": 53.85,
+        "hpl": 96.54,
+        "zj": 10732,
+        "lmh": 6311,
+        "hyly": 332,
+        "yykj": 295,
+        "jdgc": 3794
     }]
     // 初始化年份
-    try{document.getElementById("yearl").value = '2023';}catch(e){}
+    try{document.getElementById("yearl").value = '2024';}catch(e){}
     // 学生人数
     var chartDom = document.getElementById('jylyPerEchar');
     var myChart = echarts.init(chartDom);
@@ -213,6 +231,7 @@ function education() {
     option && myChart.setOption(option);
     // 学校数
     var chartDom = document.getElementById('jylySchoolEchar');
+    console.log(chartDom)
     var myChart = echarts.init(chartDom);
     var option;
     option = {

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

@@ -1,5 +1,5 @@
 function healthCareNew() {
-
+console.log(11)
     var jsonData1 = [
         ['product', '医疗卫生机构床位数(个)'],
         // ['2021年', 7208, 7178, 30],
@@ -21,6 +21,7 @@ function healthCareNew() {
     //机构数、床位数
     //柱状图
     var chartDom = document.getElementById('wsylchar');
+    console.log(chartDom)
     var myChart = echarts.init(chartDom);
     var option;
     var tapsTitleLi = $('.div-wsyl .title li');

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

@@ -390,7 +390,7 @@
                 <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=5')">
                     更多</div>
             </div>
-            <div class="name">2023年学生人数与学校数统计</div>
+            <div class="name">2024年学生人数与学校数统计</div>
             <div style="display: flex;margin-top: 10px;">
                 <div id="jylyPerEchar" style="width: 300px;height:380px;"></div>
                 <div id="jylySchoolEchar" style="width: 390px;height:380px;"></div>

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

@@ -5,13 +5,21 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据月报">
+    <meta name="ColumnDescription" content="数据月报">
+    <meta name="ColumnKeywords" content="数据月报">
+    <meta name="ColumnType" content="数据月报">
     <title>数据月报-重庆市南岸区人民政府网</title>
 </head>
 
 <body>
-<div style="width:100%;height:280px" id="header"></div>
-<iframe src="dataDetail.html" frameborder="0" style="width: 100%;height: 3100px;" scrolling="no"></iframe>
-<div style="width:100%;" id="footer"></div>
+    <div style="width:100%;height:280px" id="header"></div>
+    <iframe src="dataDetail.html" frameborder="0" style="width: 100%;height: 3100px;" scrolling="no"></iframe>
+    <div style="width:100%;" id="footer"></div>
 </body>
 
 <script src="js/jquery-3.5.1.min.js"></script>

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

@@ -5,6 +5,14 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据汇总页面">
+    <meta name="ColumnDescription" content="数据汇总页面">
+    <meta name="ColumnKeywords" content="数据汇总页面">
+    <meta name="ColumnType" content="数据汇总页面">
     <title>数据汇总页面-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="dataCenter/css/conmon.css">
     <style>

nngkxxdp/src/main/resources/static/naxsb/znxzchoice.html

@@ -309,7 +309,7 @@
                 let dataList;
                 that.getParkData();
                 $.ajax({
-                    url: "http://192.168.0.28:8443/sellBuild/newQueryOne",
+                    url: conpath + "/sellBuild/newQueryOne",
                     type: "post",
                     contentType: 'application/json',
                     data: JSON.stringify(json),

nngkxxdp/src/main/resources/static/zdjc/details.html

@@ -4,10 +4,18 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=0.5">
-     <link href="img/favicon.ico" rel="shortcut icon">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+    <!--栏目类-->
+    <meta name="ColumnName" content="重大行政决策公开">
+    <meta name="ColumnDescription" content="重大行政决策公开">
+    <meta name="ColumnKeywords" content="重大行政决策公开">
+    <meta name="ColumnType" content="重大行政决策公开">
+    <link href="img/favicon.ico" rel="shortcut icon">
     <link rel="stylesheet" href="./css/details.css">
     <link rel="stylesheet" type="text/css" href="./layui/css/layui.css" />
-    <title>重庆市南岸区人民政府--重大行政决策公开</title>
+    <title>重大行政决策公开-重庆市南岸区人民政府</title>
     <style type="text/css">
     	#draftDecision .tit:first-child, #jd .tit:first-child, #pdFile .tit:first-child, #zcdecode .tit:first-child {
     		font-family: FZXiaoBiaoSong-B05S !important;