elis 1 год назад
Родитель
Сommit
0d2338d91f
25 измененных файлов с 104 добавлено и 52 удалено
  1. 1 1
      nngkxxdp/src/main/resources/static/hqzc/index.html
  2. 1 1
      nngkxxdp/src/main/resources/static/hqzc/navMobile.html
  3. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/culturalTourism.html
  4. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/healthCare.html
  5. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/index.html
  6. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/indexMobile.html
  7. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/socialAssistance.html
  8. 1 1
      nngkxxdp/src/main/resources/static/natj/dataCenter/socialSecurity.html
  9. 1 1
      nngkxxdp/src/main/resources/static/natj/progress/index.html
  10. 4 1
      nngkxxdp/src/main/resources/static/natj/rk.html
  11. 1 1
      nngkxxdp/src/main/resources/static/natj/rk_Mobild.html
  12. 1 1
      nngkxxdp/src/main/resources/static/school/js/schoolDetail.js
  13. 2 2
      nngkxxdp/src/main/resources/static/school/school.html
  14. 1 1
      nngkxxdp/src/main/resources/static/school/schoolDetailMobile.html
  15. 1 1
      nngkxxdp/src/main/resources/static/school/schoolDetailMoblies.html
  16. 1 1
      nngkxxdp/src/main/resources/static/school/schoolMobile.html
  17. 1 1
      nngkxxdp/src/main/resources/static/school/schoolMobiles.html
  18. 8 2
      nngkxxdp/src/main/resources/static/zdjc/decision.html
  19. 1 0
      nngkxxdp/src/main/resources/static/zdjc/decisionDetail.html
  20. 64 22
      nngkxxdp/src/main/resources/static/zdjc/decisionmobile.html
  21. 2 2
      nngkxxdp/src/main/resources/static/zdjc/pc_sy.html
  22. 2 2
      nngkxxdp/src/main/resources/static/zdjc/pc_xq.html
  23. 2 2
      nngkxxdp/src/main/resources/static/zdjc/sy.html
  24. 2 2
      nngkxxdp/src/main/resources/static/zdjc/symobile.html
  25. 2 2
      nngkxxdp/src/main/resources/static/zdjc/xq.html

+ 1 - 1
nngkxxdp/src/main/resources/static/hqzc/index.html

@@ -42,7 +42,7 @@
   setHeader()
   setFooter()
   function setHeader() {
-    $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+    $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
   }
   function setFooter() {
     $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")

+ 1 - 1
nngkxxdp/src/main/resources/static/hqzc/navMobile.html

@@ -29,7 +29,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setFooter(){
         $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/dataCenter/culturalTourism.html

@@ -397,7 +397,7 @@
     setHeader()
     setFooter()
     function setHeader() {
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter() {

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/dataCenter/healthCare.html

@@ -173,7 +173,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

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

@@ -610,7 +610,7 @@
     setHeader()
     setFooter()
     function setHeader() {
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter() {

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/dataCenter/indexMobile.html

@@ -648,7 +648,7 @@
     setHeader()
     setFooter()
     function setHeader() {
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter() {

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/dataCenter/socialAssistance.html

@@ -69,7 +69,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/dataCenter/socialSecurity.html

@@ -259,7 +259,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/progress/index.html

@@ -19,7 +19,7 @@
     setHeader()
     setFooter()
     function setHeader() {
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter() {

+ 4 - 1
nngkxxdp/src/main/resources/static/natj/rk.html

@@ -8,6 +8,9 @@
     <title>数据汇总页面-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="dataCenter/css/conmon.css">
     <style>
+        body{
+            background: #081C39;
+        }
         .container {
             background: url('./images/bg.png');
             background-size: 100% 100%;
@@ -157,7 +160,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setFooter(){
         $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")

+ 1 - 1
nngkxxdp/src/main/resources/static/natj/rk_Mobild.html

@@ -126,7 +126,7 @@
     setHeader()
     setFooter()
     function setHeader() {
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setFooter() {
         $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")

+ 1 - 1
nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -47,7 +47,7 @@ function back(){
 }
 
 function setHeader(){
-	$("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+	$("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
 }
 
 function setFooter(){

+ 2 - 2
nngkxxdp/src/main/resources/static/school/school.html

@@ -160,8 +160,8 @@
     setHeader()
     setFooter()
     function setHeader(){
-        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

+ 1 - 1
nngkxxdp/src/main/resources/static/school/schoolDetailMobile.html

@@ -214,7 +214,7 @@
 
 <body>
 <!--    <div style="width:100%;height:280px" id="header"></div>-->
-<!--    <iframe width="100%" height="280px" src="https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html"></iframe>-->
+<!--    <iframe width="100%" height="280px" src="https://www.cqna.gov.cn/ggbf_search/top/top_style.html  "></iframe>-->
     <div class="content">
         <div class="schoolList">
             <div class="logo">

+ 1 - 1
nngkxxdp/src/main/resources/static/school/schoolDetailMoblies.html

@@ -51,7 +51,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

+ 1 - 1
nngkxxdp/src/main/resources/static/school/schoolMobile.html

@@ -289,7 +289,7 @@
     }
 
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
 
     function setFooter(){

+ 1 - 1
nngkxxdp/src/main/resources/static/school/schoolMobiles.html

@@ -29,7 +29,7 @@
     setHeader()
     setFooter()
     function setHeader(){
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setFooter(){
         $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")

+ 8 - 2
nngkxxdp/src/main/resources/static/zdjc/decision.html

@@ -19,18 +19,24 @@
     }
 </style>
 <body>
-<iframe id="childshell" width="100%" height="1000px" src="decisionDetail.html"></iframe>
-<div style="width:100%;" id="footer"></div>
+<div id="content" style="width:100%;"></div>
+<iframe id="childshell" width="100%" height="350" src="https://www.cqna.gov.cn/data/footer/footer.html"></iframe>
+<!--<iframe style="width:100%;" id="footer"></iframe>-->
 
 </body>
 <script src="js/jquery-3.5.1.min.js"></script>
 <script type="text/javascript">
     setFooter()
+    setContent()
 
     function setFooter(){
         $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")
     }
 
+    function setContent(){
+        $("#content").load("decisionDetail.html")
+    }
+
 </script>
 
 

+ 1 - 0
nngkxxdp/src/main/resources/static/zdjc/decisionDetail.html

@@ -123,6 +123,7 @@
         .mainTable {
             width: 80%;
             max-width: 1158px;
+            min-height: 500px;
             margin: auto;
             margin-bottom: 50px;
         }

+ 64 - 22
nngkxxdp/src/main/resources/static/zdjc/decisionmobile.html

@@ -296,27 +296,36 @@
 
             <ul class="yearChioce">
                 <li class="year active" data-id="1">
-                    <div class="num">2022</div>
+                    <div class="num">2023</div>
                     <img class="diamond" src="img/lingxing-c.png">
                 </li>
                 <li class="year" data-id="2">
+                    <div class="num">2022</div>
+                    <img class="diamond" src="img/lingxing-c.png">
+                </li>
+                <li class="year" data-id="3">
                     <div class="num">2021</div>
                     <img class="diamond" src="img/lingxing.png"></img>
                 </li>
-                <img class="line" src="img/line1.png" style="width: 100vw;height: 2px">
+                <img class="line" src="img/line1.png" style="width: 100%;height: 2px">
             </ul>
-            <div class="ly-first layui-hide mainTable">
+
+            <div class="ly-one layui-hide mainTable">
                 <div class="title">2021年度重庆市南岸区人民政府重大行政决策事项目录</div>
                 <table class="layui-hide" id="tableData1"></table>
                 <!--<div id="decision_Content"></div>-->
                 <div class="moreNullData" id="nulldata" style="display: none">无数据!</div>
                 <!--<div class="more " id="moreConntent" onclick="addMoreContent()">更多>></div>-->
             </div>
-            <div class="mainTable ly-last">
+            <div class="mainTable layui-hide ly-two">
                 <!--            <img alt="" src="/data/zdjc_ml/zdgk-index-table-v2-1.jpg">-->
                 <div class="title">2022年度重庆市南岸区人民政府重大行政决策事项目录</div>
                 <table class="layui-hide" id="tableData"></table>
             </div>
+            <div class="mainTable  ly-three">
+                <div class="title">2023年度重庆市南岸区人民政府重大行政决策事项目录</div>
+                <table class="layui-hide" id="tableData2"></table>
+            </div>
         </div>
     </div>
 </div>
@@ -370,13 +379,30 @@
             table = layui.table;
         var tapsIndex = 0;
         $('.yearChioce').on('click', 'li', function () {
-            if ($(this).attr('data-id') == 1) {
-                $('.ly-first').addClass('layui-hide');
-                $('.ly-last').removeClass('layui-hide');
-            } else {
-                $('.ly-first').removeClass('layui-hide');
-                $('.ly-last').addClass('layui-hide');
+            $('.ly-one').addClass('layui-hide');
+            $('.ly-two').addClass('layui-hide');
+            $('.ly-three').addClass('layui-hide');
+            // debugger
+            var dataid =  $(this).attr('data-id')
+            console.log(dataid)
+            switch (dataid){
+                case "3":
+                    $('.ly-one').removeClass('layui-hide');
+                    break
+                case "2":
+                    $('.ly-two').removeClass('layui-hide');
+                    break
+                case "1":
+                    $('.ly-three').removeClass('layui-hide');
+                    break
             }
+            // if ($(this).attr('data-id') == 1) {
+            //     $('.ly-first').addClass('layui-hide');
+            //     $('.ly-last').removeClass('layui-hide');
+            // } else {
+            //     $('.ly-first').removeClass('layui-hide');
+            //     $('.ly-last').addClass('layui-hide');
+            // }
             var tapsTitleLi = $('.yearChioce li');
             tapsTitleLi.removeClass('active');
             $(this).addClass('active');
@@ -444,13 +470,13 @@
         //展示已知数据
         table.render({
             elem: '#tableData'
-            , url: PATH + '/postManagement/queryAllImportmentByYear?year=2022'
+            ,url: PATH + '/postManagement/queryAllImportmentByYear?year=2022'
             , cols: [[ //标题栏
-                {type: 'numbers', title: '序号', width: "8%", align: "center"}
-                , {field: 'postTitle', title: '决策事项',width: "40%", templet: opra, align: "center"}
-                , {field: 'deptName', title: '承办单位', width: "20%", align: "center"}
-                , {field: 'releaseTime', title: '决策时间', width: "16%", templet: timeFormat, align: "center"}
-                , {field: 'type', title: '决策状态',templet: typeFormat, align: "center"}
+                {type: 'numbers', title: '序号', width: "5%",align:"center"}
+                , {field: 'postTitle', title: '决策事项', width: "55%", templet: opra,align:"center"}
+                , {field: 'deptName', title: '承办单位', width: "18%",align:"center"}
+                , {field: 'releaseTime', title: '决策时间', width: "12%", templet: timeFormat,align:"center"}
+                , {field: 'type', title: '决策状态',  templet: typeFormat,align:"center"}
             ]]
             //,skin: 'line' //表格风格
             , even: true
@@ -461,13 +487,29 @@
 
         table.render({
             elem: '#tableData1'
-            , url: PATH + '/postManagement/queryAllImportmentByYear?year=2021'
+            ,url: PATH + '/postManagement/queryAllImportmentByYear?year=2021'
+            , cols: [[ //标题栏
+                {type: 'numbers', title: '序号', width: "5%",align:"center"}
+                , {field: 'postTitle', title: '决策事项',width: "55%", templet: opra,align:"center"}
+                , {field: 'deptName', title: '承办单位', width: "18%",align:"center"}
+                , {field: 'releaseTime', title: '决策时间', width: "12%", templet: timeFormat,align:"center"}
+                , {field: 'type', title: '决策状态', templet: typeFormat,align:"center"}
+            ]]
+            //,skin: 'line' //表格风格
+            , even: true
+            //,page: true //是否显示分页
+            //,limits: [5, 7, 10]
+            //,limit: 5 //每页默认显示的数量
+        });
+        table.render({
+            elem: '#tableData2'
+            ,url: PATH + '/postManagement/queryAllImportmentByYear?year=2023'
             , cols: [[ //标题栏
-                {type: 'numbers', title: '序号', width: "8%", align: "center"}
-                , {field: 'postTitle', title: '决策事项', width: "40%",templet: opra, align: "center"}
-                , {field: 'deptName', title: '承办单位', width: "20%", align: "center"}
-                , {field: 'releaseTime', title: '决策时间', width: "16%", templet: timeFormat, align: "center"}
-                , {field: 'type', title: '决策状态', templet: typeFormat, align: "center"}
+                {type: 'numbers', title: '序号', width: "5%",align:"center"}
+                , {field: 'postTitle', title: '决策事项', width: "55%", templet: opra,align:"center"}
+                , {field: 'deptName', title: '承办单位', width: "18%",align:"center"}
+                , {field: 'releaseTime', title: '决策时间', width: "12%", templet: timeFormat,align:"center"}
+                , {field: 'type', title: '决策状态',  templet: typeFormat,align:"center"}
             ]]
             //,skin: 'line' //表格风格
             , even: true

+ 2 - 2
nngkxxdp/src/main/resources/static/zdjc/pc_sy.html

@@ -302,8 +302,8 @@
         // setHeader()
         // setFooter()
         // function setHeader(){
-        //     // $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-        //     $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        //     // $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+        //     $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
         // }
         //
         // function setFooter(){

+ 2 - 2
nngkxxdp/src/main/resources/static/zdjc/pc_xq.html

@@ -360,8 +360,8 @@
         // setHeader()
         // setFooter()
         // function setHeader(){
-        //     // $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-        //     $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        //     // $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+        //     $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
         // }
         //
         // function setFooter(){

+ 2 - 2
nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -36,8 +36,8 @@
     setFooter()
     setContent()
     function setHeader(){
-        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setContent(){
         var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;

+ 2 - 2
nngkxxdp/src/main/resources/static/zdjc/symobile.html

@@ -678,8 +678,8 @@
 	setHeader()
 	setFooter()
 	function setHeader() {
-		// $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-		$("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+		// $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+		$("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
 	}
 
 	function setFooter() {

+ 2 - 2
nngkxxdp/src/main/resources/static/zdjc/xq.html

@@ -42,8 +42,8 @@
     setHeader()
     setFooter()
     function setHeader(){
-        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022top/head.html")
+        // $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
+        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html  ")
     }
     function setContent(){
         var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;