Bladeren bron

修改地图和政策问答的底部

a 1 jaar geleden
bovenliggende
commit
a810542e64

+ 15 - 15
nngkxxdp/src/main/java/com/example/nngkxxdp/NngkxxdpApplication.java

@@ -16,9 +16,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @ServletComponentScan
 @MapperScan({"com.example.nngkxxdp.dao", "com.example.nngkxxdp.program.dao"})
 public class NngkxxdpApplication {
-
-    @Value("${http.port}")
-    private Integer port;
+//
+//    @Value("${http.port}")
+//    private Integer port;
 
 
 
@@ -27,16 +27,16 @@ public class NngkxxdpApplication {
     }
 
 //    前面基本一致,只不过注入了一个http端口,主要改下面
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-        tomcat.addAdditionalTomcatConnectors(createStandardConnector()); // 添加http
-        return tomcat;
-    }
-    // 配置http
-    private Connector createStandardConnector() {
-        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-        connector.setPort(port);
-        return connector;
-    }
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+//        tomcat.addAdditionalTomcatConnectors(createStandardConnector()); // 添加http
+//        return tomcat;
+//    }
+//    // 配置http
+//    private Connector createStandardConnector() {
+//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+//        connector.setPort(port);
+//        return connector;
+//    }
 }

+ 24 - 726
nngkxxdp/src/main/resources/static/district/sy.html

@@ -1,741 +1,39 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
+
 <head>
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit"/>
-    <meta name="force-rendering" content="webkit"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/>
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=0.5, minimum-scale=1.0, maximum-scale=1.0">
-    <link href="img/favicon.ico" rel="shortcut icon">
-    <link rel="stylesheet" href="./css/foot.css">
-    <link rel="stylesheet" href="./layui/css/layui.css">
-    <link rel="stylesheet" href="./css/district.css">
-    <link rel="stylesheet" href="./css/sy.css">
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width" />
     <title>重庆市南岸区政务公开惠民便民地图</title>
 </head>
 <style>
-    ul{
-        padding: 0;
-        margin: 0;
-    }
-    .BMap_bubble_content{
-        height: 100% !important;
-        overflow-y: scroll !important;
-        overflow-x: hidden;
-    }
-
-    /* 定义滚动条宽高及背景,宽高分别对应横竖滚动条的尺寸 */
-    .BMap_bubble_content::-webkit-scrollbar {
-        width: 10px; /* 对垂直滚动条有效 */
+    body{
+        width: 100%;
+        height: 100%;
+        margin: 0px;
+        padding: 0px;
     }
-
-    /* 定义滚动条的轨道颜色、内阴影及圆角 */
-    .BMap_bubble_content::-webkit-scrollbar-track {
-        /*-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);*/
-        background-color: #fff;
-    }
-
-    /* 定义滑块颜色、内阴影及圆角 */
-    .BMap_bubble_content::-webkit-scrollbar-thumb {
-        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-        background-color: rgba(0, 0, 0, .1);
+    iframe{
+        border: 0px;
     }
 
+</style>
+<body>
+<iframe id="childshell" width="100%" height="1000px" src="syDteail.html"></iframe>
+<div style="width:100%;" id="footer"></div>
 
-    /* 光标移到滚动滑块上样式颜色变深 */
-    .BMap_bubble_content::-webkit-scrollbar-thumb:hover {
-        background-color: rgba(0, 0, 0, .2);
-    }
+</body>
+<script src="js/jquery-3.5.1.min.js"></script>
+<script type="text/javascript">
 
-    /* 定义两端按钮的样式 */
-    .BMap_bubble_content::-webkit-scrollbar-button {
-        display: none;
-    }
+    setFooter()
 
-    /* 定义右下角汇合处的样式 */
-    .BMap_bubble_content::-webkit-scrollbar-corner {
-        background: khaki;
+    function setFooter(){
+        $("#footer").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022foot/foot.html")
     }
-</style>
-<body>
-<div class="head">
-    <!-- 头部蓝色部分的logo和文字 -->
 
-    <div class="left-logo">
-        <a href="https://www.cqna.gov.cn/" target="_blank">
-            <img class="logo-img" src="img/map-logo.png">
-        </a>
-    </div>
-    <!-- 头部的搜索框 -->
-    <div class="right-search">
-        <div class="layui-tab">
-            <ul class="layui-tab-title search-change">
-                <li class="layui-this">搜索</li>
-                <li>公交</li>
-                <li>自驾</li>
-            </ul>
-            <div class="layui-tab-content content-input">
-                <div class="layui-tab-item layui-show">
-                    <div class="input-icon">
-                        <input type="text" name="" id="" value="" class="inp"/>
-                        <img src="img/ss2.png" class="inp-icon1">
-                    </div>
-                </div>
-                <!--  点击公交出现的内容  -->
-                <div class="layui-tab-item">
-                    <div class="input-icon">
-                        <input type="text" id="gj-one" value=""/>
-                        <div id="change-word"></div>
-                        <input type="text" name="" id="gj-two" value=""/>
-                        <img src="img/ss2.png" class="inp-icon2" id="inp-icon2">
-                    </div>
-                </div>
-                <!--  点击自驾出现的内容  -->
-                <div class="layui-tab-item">
-                    <div class="input-icon">
-                        <input type="text" name="" id="zj-one" value=""/>
-                        <div id="word-change"></div>
-                        <input type="text" name="" id="zj-two" value=""/>
-                        <img src="img/ss2.png" class="inp-icon3" id="inp-icon3">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="erw">
-        <a href="javascript:;" onclick="aria.start()" style="
-        width: 207px;
-        text-align: center;
-        font-size: 21px;
-        height: 140px;
-        line-height: 140px;
-        color: #fff;">网站无障碍</a>
-        <a href="http://www.cqna.gov.cn/vr/vr.html" target="_blank">
-            <img src="./img/second-erw-3.png" alt="" class="first_erw">
-        </a>
-        <img src="./img/first-ewm-2.png" alt="" class="first_erw">
-        <img src="./img/second-erm.png" alt="" class="second_erw">
-        <a href="https://www.cqna.gov.cn/" class="back_sy">返回网站首页</a>
-    </div>
-</div>
-<div class="main">
-    <div class="left-map">
-        <div class="show-first">
-            <div class="wrap_fwdt">
-                <div class="box_fwdt">
-                    <img src="img/fwdt.png" class="fwdt_img">
-                    <p class="fwdt_text">服务导图</p>
-                </div>
-                <div class="fwdt_line"></div>
-            </div>
-            <ul class="flex_box">
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fgk.png">
-                        <p class="flex_text">政务公开</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fzwfw.png">
-                        <p class="flex_text">政务服务</p>
-                    </div>
-                    <div class="flex_pop pop lineTwo" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="区级行政服务中心">区级政务服务中心</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="镇(街道)公共服务中心">镇(街道)便民服务中心</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="村(社区)便民服务中心">村(社区)便民服务站</a>
-                            </li>
-                            <!-- <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="市场监督管理所">市场监督管理所</a>
-                            </li> -->
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="生源地助学贷款办理点">生源地助学贷款办理点</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fdqfwzx.png">
-                        <p class="flex_text">党群服务</p>
-                    </div>
-                    <div class="flex_pop pop lineThree" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="党群服务中心">党群服务中心</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fjy.png">
-                        <p class="flex_text">教育资源</p>
-                    </div>
-                    <div class="flex_pop pop lineFour" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="职业教育学校">职业教育学校</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="特殊教育学校">特殊教育学校</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="高等院校">高等院校</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="小学">小学</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="中学">中学</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="幼儿园">幼儿园</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="教育考试中心">教育考试中心</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-<!--                <li class="flex_li">-->
-<!--                    <div class="img_tab">-->
-<!--                        <img src="img/fhsjc.png">-->
-<!--                        <p class="flex_text">核酸检测</p>-->
-<!--                    </div>-->
-<!--                </li>-->
+</script>
 
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fyl.png">
-                        <p class="flex_text">医疗卫生</p>
-                    </div>
-                    <div class="flex_pop_two pop lineOne" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="村卫生室">村卫生室</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="社区卫生服务站">社区卫生服务站</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="儿科诊疗服务机构">儿科诊疗服务机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="狂犬病、破伤风处置门诊">狂犬病、破伤风处置门诊</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="免疫规划预防接种门诊">免疫规划预防接种门诊</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="二级医疗机构">二级医疗机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="三级医疗机构">三级医疗机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="社区卫生服务机构">社区卫生服务机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="职业病诊断机构">职业病诊断机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="助产医疗机构">助产医疗机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="产科门诊服务机构">产科门诊服务机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="医疗保障事务中心">医疗保障事务中心</a>
-                            </li>
-<!--                            <li>-->
-<!--                                <img src="img/flex.png">-->
-<!--                                <a class="mapnav" title="核酸采样点">核酸采样点</a>-->
-<!--                            </li>-->
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fhjgl.png">
-                        <p class="flex_text">户籍管理</p>
-                    </div>
-                    <div class="flex_pop_two pop lineTwo" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="派出所">派出所</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="出入境业务办理机构">出入境业务办理机构</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fjtfw.png">
-                        <p class="flex_text">交通服务</p>
-                    </div>
-                    <div class="flex_pop_two pop lineThree" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="交通支大队">交通支大队</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="交通违法处理机构">交通违法处理机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="交通事故处理机构">交通事故处理机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="车管所">车管所</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="机动车检测场所">机动车检测场所</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="驾驶人体检医院">驾驶人体检医院</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="车驾管社会服务站">车驾管社会服务站</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fshbz.png">
-                        <p class="flex_text">社会保障</p>
-                    </div>
-                    <div class="flex_pop_two pop lineFour" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="就业和人才中心">就业和人才中心</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="社会保险事务中心">社会保险事务中心</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fylfw.png">
-                        <p class="flex_text">养老服务</p>
-                    </div>
-                    <div class="flex_pop_three pop lineOne" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="养老机构">养老机构</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fmzfw.png">
-                        <p class="flex_text">民政服务</p>
-                    </div>
-                    <div class="flex_pop_three pop lineTwo" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="婚姻登记机构">婚姻登记机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="殡仪服务机构">殡仪服务机构</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fbsfwt.png">
-                        <p class="flex_text">办税服务</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fscjd.png">
-                        <p class="flex_text">市场监管</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fgzf.png">
-                        <p class="flex_text">住房保障</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fbdcdj.png">
-                        <p class="flex_text">不动产登记</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fgjj.png">
-                        <p class="flex_text">住房公积金</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fwtly.png">
-                        <p class="flex_text">文体旅游</p>
-                    </div>
-                    <div class="flex_pop_four pop lineFour" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="图书馆">图书馆</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="文化馆">文化馆</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="文管所">文管所</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="公共体育馆">公共体育馆</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="旅游景点">旅游景点</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="公园">公园</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fsffw.png">
-                        <p class="flex_text">司法服务</p>
-                    </div>
-                    <div class="flex_pop_five pop lineOne" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="公证处">公证处</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="司法鉴定机构">司法鉴定机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="基层司法所">基层司法所</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="法律援助机构">法律援助机构</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="矫正中心">矫正中心</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fcjr.png">
-                        <p class="flex_text">助残服务</p>
-                    </div>
-                    <div class="flex_pop_five pop lineTwo" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="残疾人服务中心">残疾人服务中心</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="定点残疾人服务机构">定点残疾人服务机构</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fcyy.png">
-                        <p class="flex_text">产业园区</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fbmfw.png">
-                        <p class="flex_text">商业服务</p>
-                    </div>
-                    <div class="flex_pop_five pop lineFour" style="display: none;">
-                        <ul class="flex_wrap">
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="商圈">商圈</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="购物中心">购物中心</a>
-                            </li>
-                            <li>
-                                <img src="img/flex.png">
-                                <a class="mapnav" title="酒店">酒店</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/fgc.png">
-                        <p class="flex_text">便民公厕</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/ftc.png">
-                        <p class="flex_text">停车泊车</p>
-                    </div>
-                </li>
-                <li class="flex_li">
-                    <div class="img_tab">
-                        <img src="img/zysd.png">
-                        <p class="flex_text">直饮水点</p>
-                    </div>
-                </li>
-                <li class="flex_li"></li>
-            </ul>
-            <div class="text-second"></div>
-        </div>
-        <!-- 受理场所和查阅场所 -->
-        <div class="layui-tab layui-tab-brief show-fifth" lay-filter="docDemoTabBrief">
-            <div class="title-second">
-                <h6>政务公开</h6>
-                <button type="button" class="backBtn">返回</button>
-            </div>
-            <ul class="layui-tab-title top-title">
-                <li class="layui-this">
-                    <img src="img/slcs1.png">
-                    <img src="img/slcs2.png" class="hideIcon">
-                    受理场所
-                </li>
-                <li>
-                    <img src="img/sycs1.png" class="hideIcon">
-                    <img src="img/sycs2.png">
-                    查阅场所
-                </li>
-            </ul>
-            <div class="layui-tab-content">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-tab">
-                        <ul class="layui-tab-title second-title">
-                            <li class="layui-this">区级部门</li>
-                            <li>街镇</li>
-                        </ul>
-                        <div class="layui-tab-content hidePadding">
-                            <div class="layui-tab-item layui-show hidePadding">
-                                <div class="districtLevel"></div>
-                                <div class="textThird"></div>
-                            </div>
-                            <div class="layui-tab-item hidePadding">
-                                <div class="text-first">
-                                    <p class="tab alltotal">全部</p>
-                                    <p>南坪镇</p>
-                                    <p>涂山镇</p>
-                                    <p>鸡冠石镇</p>
-                                    <p>峡口镇</p>
-                                    <p>长生桥镇</p>
-                                    <p>迎龙镇</p>
-                                    <p>广阳镇</p>
-                                    <p>南坪街道</p>
-                                    <p>花园路街道</p>
-                                    <p>海棠溪街道</p>
-                                    <p>铜元局街道</p>
-                                    <p>龙门浩街道</p>
-                                    <p>弹子石街道</p>
-                                    <p>南山街道</p>
-                                    <p>天文街道</p>
-                                </div>
-                                <div class="text-second" id="text-second"></div>
-                                <div class="text-third"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-tab">
-                        <ul class="layui-tab-title second-title2">
-                            <li class="layui-this">区级部门</li>
-                            <li>街镇</li>
-                        </ul>
-                        <div class="layui-tab-content hidePadding">
-                            <div class="layui-tab-item hidePadding layui-show">
-                                <div class=" districtLevel2"></div>
-                                <div class="textThird2"></div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class=" districtLevel2"></div>
-                                <div class="textThird2"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- 点击公交搜索出现的路径选择 -->
-        <div class="show-second">
-            <div class="title-second">
-                <h6>搜索</h6>
-                <button type="button" class="backBtn">返回</button>
-            </div>
-            <div class="content-second">
-                <div id="start"></div>
-                <img src="img/right-grey.png">
-                <div id="end"></div>
-            </div>
-            <div class="layui-tab content-third">
-                <ul class="layui-tab-title content-title">
-                    <li class="layui-this">时间最短</li>
-                    <li>少换乘</li>
-                    <li>少步行</li>
-                    <li>不乘地铁</li>
-                </ul>
-                <div class="layui-tab-content" id="result"></div>
-            </div>
-            <div class="zjboxpanel">
-                <h5 id="startbus">请选择起点</h5>
-                <ul id="busstartPanel"></ul>
-                <h5 id="endBus">请选择终点</h5>
-                <ul id="busendPanel"></ul>
-            </div>
-        </div>
-        <!-- 点击自驾搜索出现的路径选择 -->
-        <div class="show-third">
-            <div class="title-second">
-                <h6>搜索</h6>
-                <button type="button" class="backBtn">返回</button>
-            </div>
-            <div class="content-second">
-                <div id="start2"></div>
-                <img src="img/right-grey.png">
-                <div id="end2"></div>
-            </div>
-            <div class="layui-tab content-third">
-                <ul class="layui-tab-title main-third" id="zjxz">
-                    <li class="layui-this">推荐路线</li>
-                    <li>最短路程</li>
-                    <li>不走高速</li>
-                </ul>
-                <div class="layui-tab-content" id="result1"></div>
-            </div>
-            <div class="boxpanel">
-                <h5 id="startDrving">请选择起点</h5>
-                <ul id="startPanel"></ul>
-                <h5 id="endDrving">请选择终点</h5>
-                <ul id="endPanel"></ul>
-            </div>
-        </div>
-        <!-- 点击搜索出现的页面 -->
-        <div class="show-fourth">
-            <div class="title-second">
-                <h6>搜索</h6>
-                <button type="button" class="backBtn">返回</button>
-            </div>
-            <div class="search-result" id="search-result">
-                <!-- <div class="textSecond"></div>
-                <div class="textFourth"></div> -->
-            </div>
-        </div>
-    </div>
-    <div class="right-map" id="right-map"></div>
-    <a href="http://www.cqna.gov.cn/ghwd/znwd/index.html" target="_blank" class="right-button"><img src="./img/gdwt.png"
-                                                                                                    alt=""></a>
-</div>
-<!-- 底部 -->
-<div style="width: 100%;overflow: hidden;height: 100px;">
-    <div class="foot_content">
-        <div class="three_pic">
-            <a href="http://bszs.conac.cn/sitename?method=show&id=169360097F9303C8E053022819AC5CD0" target="_blank">
-                <img src="img/dzjg.png" >
-            </a>
-            <a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=50010802001142" target="_blank">
-                <img src="img/jc.png" >
-            </a>
-            <span>
 
-				<img src="img/zfwz.png" >
-			</span>
-        </div>
-        <div class="f_text">
-            <p>重庆市南岸区人民政府 版权所有 主办:重庆市南岸区人民政府办公室</p>
-            <p><a style=" text-decoration: none;color: #fff;" href="https://beian.miit.gov.cn/#/Integrated/recordQuery" target="_blank">渝ICP备2021011583号</a> 政府网站标识码:5001080014<span><img src="img/jh.png" ></span>渝公网安备 50010802001142号</p>
-        </div>
-        <div class="f_list">
-            <a href="http://www.cqna.gov.cn/ggbf_search/lxwm/202109/t20210910_9683034.html">联系我们</a>
-            <span>|</span>
-            <a href="http://www.cqna.gov.cn/ggbf_search/wzdt/">网站地图</a>
-            <span>|</span>
-            <a href="http://www.cqna.gov.cn/ggbf_search/bqsm/202109/t20210910_9683174.html">版权说明</a>
-        </div>
-    </div>
-</div>
-<script defer async type="text/javascript" src="//gov.govwza.cn/dist/aria.js?appid=f9d6e7b3fdc3e0b4b98ceccb24f22aa7" charset="utf-8" wapForceOldFixed="false" loadData="false" id="ariascripts"></script>
-<script type="text/javascript" src="constans_map.js"></script>
-<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq"></script>
-<script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
-<script type="text/javascript" src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
-<script type="text/javascript" src="//api.map.baidu.com/library/MarkerManager/1.2/src/MarkerManager_min.js"></script>
-<script type="text/javascript" src="./layui/layui.js"></script>
-<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
-<script src="./js/sy.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>
-</body>
-</html>
+</html>

+ 39 - 311
nngkxxdp/src/main/resources/static/natj/js/enterStatisMain.js

@@ -57,33 +57,6 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
                 color1: '#9BCE4A',
 
             },
-            // {
-            // 	title: '批发业销售额',
-            // 	id: 5,
-            // 	type: 201,
-            // 	color1: '#9BCE4A'
-            //
-            // },
-            // {
-            // 	title: '零售业销售额',
-            // 	id: 6,
-            // 	type: 202,
-            // 	color1: '#29B6F6',
-            //
-            // },
-            // {
-            // 	title: '住宿业销售额',
-            // 	id: 7,
-            // 	type: 203,
-            // 	color1: '#34D3EB'
-            // },
-            // {
-            // 	title: '餐饮业销售额',
-            // 	id: 8,
-            // 	type: 204,
-            // 	color1: '#0090f4',
-            //
-            // },
             {
                 title: '地方财政收支',
                 id: 8,
@@ -110,25 +83,6 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
                     color2: '#9cdc7e'
                 }]
             },
-            // {
-            // 	title: '金融机构存贷款',
-            // 	id: 9,
-            // 	children: [{
-            // 		title: '金融机构人民币存款余额',
-            // 		id: 7000,
-            // 		clickType: 4,
-            // 		type: 401,
-            // 		color1: '#29B6F6',
-            // 		color2: '#ffb43e'
-            // 	}, {
-            // 		title: '金融机构人民币贷款余额',
-            // 		id: 7001,
-            // 		clickType: 4,
-            // 		type: 402,
-            // 		color1: '#34D3EB',
-            // 		color2: '#5efff5'
-            // 	}]
-            // }
         ];
     laydate.render({
         elem: '#test6',
@@ -177,40 +131,17 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
             if (obj.data.title == '社会消费品零售总额总额') {
                 getinlandTradeL(obj, myChart);
             }
-            // if (obj.data.title == '批发业销售额') {
-            // 	getinlandTrade(obj, myChart);
-            // }
-            // if (obj.data.title == '零售业销售额') {
-            // 	getinlandTrade(obj, myChart);
-            // }
-            // if (obj.data.title == '住宿业销售额') {
-            // 	getinlandTrade(obj, myChart);
-            // }
-            // if (obj.data.title == '餐饮业销售额') {
-            // 	getinlandTrade(obj, myChart);
-            // }
 
             if (obj.data.title == '地方财政收支') {
                 getAllFinancial(data1, myChart)
 
             }
-            // if (obj.data.title == '金融机构存贷款') {
-            //     getAllFinan(data1, myChart)
-            //
-            // }
             if (obj.data.clickType == 1) {
                 getIndustryByTypeNew(obj, myChart);
             }
-
-            if (obj.data.clickType == 2) {
-                getinlandTrade(obj, myChart);
-            }
             if (obj.data.clickType == 3) {
                 getFinancial(obj, myChart);
             }
-            if (obj.data.clickType == 4) {
-                getBank(obj, myChart)
-            }
 
 
         }
@@ -225,6 +156,9 @@ function isMobileUserAgent() {
     );
 }
 
+// 详细数据板块开始
+
+// 商品房销售面积
 function getAllMarket(obj, myChart) {
     var str, listdataa;
     getData('./json/realtyMarket.json').then(data => {
@@ -277,6 +211,7 @@ function getAllMarket(obj, myChart) {
     })
 }
 
+// 社会消费品零售总额总额
 function getinlandTradeL(obj, myChart) {
     var str, listdataa;
     getData('./json/inlandTrade.json').then(data => {
@@ -328,6 +263,7 @@ function getinlandTradeL(obj, myChart) {
     })
 }
 
+// 建筑业总产值
 function getAllConstruction(obj, myChart) {
     var str, listdataa;
     getData('./json/construction.json').then(data => {
@@ -380,6 +316,7 @@ function getAllConstruction(obj, myChart) {
     })
 }
 
+// 规模以上工业增加值增速
 function getAllScale(obj, myChart) {
     var str, listdataa;
     getData('./json/scale.json').then(data => {
@@ -441,6 +378,7 @@ function getAllScale(obj, myChart) {
     })
 }
 
+// 地区生产总值的table表格数据
 function getAllIndustry(data1, myChart) {
     var str = '';
     var listdataa = '';
@@ -478,6 +416,7 @@ function getAllIndustry(data1, myChart) {
     })
 }
 
+// 地方财政收支
 function getAllFinancial(data1, myChart) {
     var str, listdataa;
     getData('./json/financial.json').then(data => {
@@ -514,218 +453,45 @@ function getAllFinancial(data1, myChart) {
     })
 }
 
-function getinlandTrade(obj, myChart) {
-    var str, listdataa;
-    getData('./json/inlandTrade.json').then(data => {
-        var list = data.trade;
-        var array = [];
-        var xdata = [];
-        var xname = '';
-        for (var i = 0; i < list.length; i++) {
-            var subData = list[i].subData;
-            if (subData[2].data.firstFourQuarter) {
-                xdata.push(list[i].date + '年1季度');
-                xdata.push(list[i].date + '年1-2季度');
-                xdata.push(list[i].date + '年1-3季度');
-                xdata.push(list[i].date + '年1-4季度');
-
-            } else {
-                xdata.push(list[i].date + '年1季度');
-                xdata.push(list[i].date + '年1-2季度');
-            }
-            for (var j = 0; j < subData.length; j++) {
-                if (obj.data.type == subData[j].type) {
-                    xname = subData[j].subName
-                    var ndata = subData[j].data;
-                    array.push(ndata.firstQuarter.totalQuarter ?
-                        ndata.firstQuarter.totalQuarter : 0);
-                    if (ndata.firstSecondQuarter) {
-                        array.push(ndata.firstSecondQuarter.totalQuarter ?
-                            ndata.firstSecondQuarter.totalQuarter : 0);
-                    }
-                    if (ndata.firstThridQuarter) {
-                        array.push(ndata.firstThridQuarter.totalQuarter ?
-                            ndata.firstThridQuarter.totalQuarter : 0);
-                    }
-                    if (ndata.firstFourQuarter) {
-                        array.push(ndata.firstFourQuarter.totalQuarter ?
-                            ndata.firstFourQuarter.totalQuarter : 0);
-                    }
-                }
-            }
-
-
-        }
-        var chat = [{
-            'name': obj.data.title,
-            'data': array,
-            'color1': obj.data.color1,
-            'color2': obj.data.color2,
-            'xdata': xdata
-        }]
-        option = getLine(chat, '万元');
-        myChart.setOption(option, true);
-
-        var tabletit = xname;
-        str = '<th>' + tabletit + '</th>';
-        listdataa += '<tr>'
-        listdataa += '<td>值</td>'
-        for (var j = 0; j < array.length; j++) {
-            listdataa += '<td>' + array[j] + '万元' + '</td>';
-        }
-        listdataa += '</tr>'
-        for (var j = 0; j < list.length; j++) {
-            for (var k = 0; k < list[j].totalNum.length; k++) {
-                let a = NoToChinese(Number(k) + 1)
-                str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
-            }
-
-        }
-
-        $('.tableTit').append(str);
-        $('.tableMain').append(listdataa);
-
-    })
-}
-
-function getFinancial(obj, myChart) {
-    var str, listdataa;
-    getData('./json/financial.json').then(data => {
-        var list = data.financial;
-        var array = [];
-        var xdata = [];
-        var xname = '';
-        for (var i = 0; i < list.length; i++) {
-            var subData = list[i].subData;
-            for (let j = 0; j < subData[2].data.length; j++) {
-                if (j == 0) {
+function getIndustryByTypeAllNew(list, obj) {
+    var array = [];
+    var xdata = [];
+    for (var i = 0; i < list.length; i++) {
+        var subData = list[i].subData;
+        for (let j = 0; j < subData[2].data.length; j++) {
+            switch (j) {
+                case 1:
+                    xdata.push(list[i].date + '年1-2季度');
+                    break
+                case 2:
+                    xdata.push(list[i].date + '年1-3季度');
+                    break
+                case 3:
+                    xdata.push(list[i].date + '年1-4季度');
+                    break
+                default:
                     xdata.push(list[i].date + '年1季度');
-                } else {
-                    xdata.push(list[i].date + '年1-' + (j + 1) + '季度');
-                }
-            }
-            for (const subDataKey of subData) {
-
-                if (obj.data.type == subDataKey.type) {
-                    xname = subDataKey.subName;
-                    var ndata = subDataKey.data;
-                    for (let k = 0; k < ndata.length; k++) {
-                        array.push(ndata[k].totalQuarter ? ndata[k].totalQuarter : 0)
-                    }
-                }
             }
         }
 
-        var chat = [{
-            'name': obj.data.title,
-            'data': array,
-            'color1': obj.data.color1,
-            'color2': obj.data.color2,
-            'xdata': xdata
-        }]
-        option = getLine(chat, '万元');
-
-        myChart.setOption(option, true);
-
-        var tabletit = xname;
-        str = '<th>' + tabletit + '</th>';
-        listdataa += '<tr>'
-        listdataa += '<td>值</td>'
-        for (var j = 0; j < array.length; j++) {
-            listdataa += '<td>' + array[j] + '万元' + '</td>';
-        }
-        listdataa += '</tr>'
-
-        for (var j = 0; j < list.length; j++) {
-            for (let i = 0; i < list[j].subData[0].data.length; i++) {
-
-                    let a = NoToChinese(Number(i) + 1)
-                    str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
-
-            }
-        }
-        $('.tableTit').append(str);
-        $('.tableMain').append(listdataa);
-
-
-    })
-}
-
-function getBank(obj, myChart) {
-    var str, listdataa;
-    getData('./json/bank.json').then(data => {
-        var list = data.finance;
-
-        var array = [];
-        var xdata = [];
-        var xname = '';
-        for (var i = 0; i < list.length; i++) {
-            var subData = list[i].subData;
-            if (subData[1].data.firstFourQuarter) {
-                xdata.push(list[i].date + '年1季度');
-                xdata.push(list[i].date + '年1-2季度');
-                xdata.push(list[i].date + '年1-3季度');
-                xdata.push(list[i].date + '年1-4季度');
-            } else {
-                xdata.push(list[i].date + '年1季度');
-                xdata.push(list[i].date + '年1-2季度');
-            }
-            for (var j = 0; j < subData.length; j++) {
-                if (obj.data.type == subData[j].type) {
-                    xname = subData[j].subName
-                    var ndata = subData[j].data;
-                    array.push(ndata.firstQuarter.totalQuarter ?
-                        ndata.firstQuarter.totalQuarter : 0);
-                    if (ndata.firstSecondQuarter) {
-                        array.push(ndata.firstSecondQuarter.totalQuarter ?
-                            ndata.firstSecondQuarter.totalQuarter : 0);
-                    }
-                    if (ndata.firstThridQuarter) {
-                        array.push(ndata.firstThridQuarter.totalQuarter ?
-                            ndata.firstThridQuarter.totalQuarter : 0);
-                    }
-                    if (ndata.firstFourQuarter) {
-                        array.push(ndata.firstFourQuarter.totalQuarter ?
-                            ndata.firstFourQuarter.totalQuarter : 0);
-                    }
-                }
-            }
-        }
-        var chat = [{
-            'name': obj.data.title,
-            'data': array,
-            'color1': obj.data.color1,
-            'color2': obj.data.color2,
-            'xdata': xdata
-        }]
-        option = getLine(chat, '亿元');
-
-        myChart.setOption(option, true);
-
-        var tabletit = xname;
-        str = '<th>' + tabletit + '</th>';
-        listdataa += '<tr>'
-        listdataa += '<td>值</td>'
-        for (var j = 0; j < array.length; j++) {
-            listdataa += '<td>' + array[j] + '亿元' + '</td>';
-        }
-        listdataa += '</tr>'
-        for (var j = 0; j < list.length; j++) {
-            if (list[j].subData[0].data.firstSecondQuarter) {
-                for (var k = 0; k < 4; k++) {
-                    let a = NoToChinese(Number(k) + 1)
-                    str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
+        for (var j = 0; j < subData.length; j++) {
+            if (obj.type == subData[j].type) {
+                var ndata = subData[j].data;
+                for (let k = 0; k < ndata.length; k++) {
+                    array.push(ndata[k].totalQuarter ? ndata[k].totalQuarter : 0)
                 }
-            } else {
-                str += '<th>' + list[j].date + '第一至一季度</th>'
             }
-
         }
-        $('.tableTit').append(str);
-        $('.tableMain').append(listdataa);
-    })
+    }
+    return chat = {
+        'name': obj.title,
+        'data': array,
+        'color1': obj.color1,
+        'color2': obj.color2,
+        'xdata': xdata
+    }
 }
-
+// 地区生产总值的统计图数据
 function getIndustryByTypeNew(obj, myChart) {
     var str, listdataa;
     getData('./json/jdp.json').then(data => {
@@ -791,44 +557,6 @@ function getIndustryByTypeNew(obj, myChart) {
     })
 }
 
-function getIndustryByTypeAllNew(list, obj) {
-    var array = [];
-    var xdata = [];
-    for (var i = 0; i < list.length; i++) {
-        var subData = list[i].subData;
-        for (let j = 0; j < subData[2].data.length; j++) {
-            switch (j) {
-                case 1:
-                    xdata.push(list[i].date + '年1-2季度');
-                    break
-                case 2:
-                    xdata.push(list[i].date + '年1-3季度');
-                    break
-                case 3:
-                    xdata.push(list[i].date + '年1-4季度');
-                    break
-                default:
-                    xdata.push(list[i].date + '年1季度');
-            }
-        }
-
-        for (var j = 0; j < subData.length; j++) {
-            if (obj.type == subData[j].type) {
-                var ndata = subData[j].data;
-                for (let k = 0; k < ndata.length; k++) {
-                    array.push(ndata[k].totalQuarter ? ndata[k].totalQuarter : 0)
-                }
-            }
-        }
-    }
-    return chat = {
-        'name': obj.title,
-        'data': array,
-        'color1': obj.color1,
-        'color2': obj.color2,
-        'xdata': xdata
-    }
-}
 
 var list = ''
 

+ 23 - 361
nngkxxdp/src/main/resources/static/zdjc/decision.html

@@ -1,375 +1,37 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <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">
-    <link rel="stylesheet" href="./layui/layui.css">
-    <link rel="stylesheet" href="./css/newdecision.css">
+    <meta name="viewport" content="width=device-width" />
     <title>重庆市南岸区人民政府--重大行政决策公开</title>
-    <style type="text/css">
-        /*body{*/
-        /*    min-width: 1280px;*/
-        /*}*/
-        /*chrome 和Safari*/
-        body::-webkit-scrollbar {
-            display: none;
-        }
-
-        /*IE 10+*/
-        body {
-            -ms-overflow-style: none !important;
-        }
-
-        .search {
-            display: flex;
-            justify-content: center;
-            width: 30% !important;
-            margin: 0 auto;
-            margin-bottom: 50px;
-        }
-
-        .search input {
-            width: 80%;
-            height: 36px;
-            border: 1px solid #F3D39B;
-            padding-left: 10px;
-        }
-
-        .search input::placeholder {
-            color: #ccc;
-        }
-
-        .search button {
-            width: 20%;
-            color: #fff;
-            text-align: center;
-            cursor: pointer;
-            border: 1px solid #F3D39B;
-            border-left: none;
-            background-color: #F3D39B;
-        }
-
-        .bf-ds-ct {
-            display: flex;
-            justify-content: space-around;
-            width: 27% !important;
-            margin: 0 auto;
-        }
-
-        .bf-ds-ct p {
-            cursor: pointer;
-        }
-
-        .ly-last {
-            width: 58%;
-            margin: 0 auto;
-            margin-top: 50px;
-            margin-bottom: 50px;
-        }
-
-        .ly-last img {
-            width: 100%;
-        }
-
-        /*.bf-ds-ct {*/
-        /*	background-image: url("img/click-top2.bmp");*/
-        /*	background-size: 100% 100%;*/
-        /*	cursor: pointer;*/
-        /*}*/
-        .yearChioce {
-            width: 80%;
-            max-width: 1158px;
-            margin: auto;
-            height: 60px;
-            position: relative;
-            display: flex;
-            align-items: center;
-            justify-content: space-evenly;
-        }
-
-        .yearChioce .year {
-            position: relative;
-            display: flex;
-            justify-content: center;
-            font-size: 28px;
-            font-family: Microsoft YaHei;
-            color: #E3C285;
-
-        }
-
-        .active {
-            font-size: 32px;
-            font-weight: bold;
-            font-style: italic;
-            color: #B48D44 !important;
-        }
-
-        .yearChioce .num {
-            position: absolute;
-            top: -40px;
-            cursor: pointer;
-        }
-        .yearChioce .diamond{
-            z-index: 11;
-        }
-
-        .yearChioce .line {
-            position: absolute;
-            top: 50%;
-        }
-
-        .mainTable {
-            width: 80%;
-            max-width: 1158px;
-            margin: auto;
-            margin-bottom: 50px;
-        }
-
-        .title {
-            width: 100%;
-            height: 75px;
-            background: linear-gradient(90deg, #F9DDAB, #D4AB63);
-            font-size: 28px;
-            font-family: Microsoft YaHei;
-            font-weight: bold;
-            color: #AA843D;
-            line-height: 72px;
-            text-align: center;
-        }
-
-        .layui-table tbody tr:hover, .layui-table thead tr, .layui-table-click, .layui-table-header, .layui-table-hover, .layui-table-mend, .layui-table-patch, .layui-table-tool, .layui-table-total, .layui-table-total tr, .layui-table[lay-even] tr:nth-child(even) {
-            background-color: #FAF6F0;
-        }
-
-        .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] {
-            border-color: #EBE1D2;
-            font-size: 18px;
-        }
-
-        .layui-table-view .layui-table td, .layui-table-view .layui-table th {
-            padding: 15px 0;
-        }
-
-        .layui-table, .layui-table-view {
-            margin: 0;
-        }
-
-        .layui-table-body tr td:last-child {
-            color: #999999 !important;
-        }
-
-        .layui-table-cell, .layui-table-tool-panel li {
-            overflow: inherit;
-            text-overflow: revert;
-            white-space: normal;
-        }
-
-        .layui-table-cell {
-            height: auto;
-            line-height: 20px;
-        }
-    </style>
 </head>
+<style>
+    body{
+        width: 100%;
+        height: 100%;
+        margin: 0px;
+        padding: 0px;
+    }
+    iframe{
+        border: 0px;
+    }
+</style>
 <body>
+<iframe id="childshell" width="100%" height="1000px" src="decisionDetail.html"></iframe>
+<div style="width:100%;" id="footer"></div>
 
-<div class="head">
-
-</div>
-<div class="process">
-
-    <div class="bf-pc">决策流程</div>
-    <div class="line"></div>
-    <div class="pc-ct">
-        <div class="ct">
-            <div class="ct-1"></div>
-            <div class="ct-tx">决策公示</div>
-        </div>
-        <div class="arrow-1"></div>
-        <div class="ct">
-            <div class="ct-2"></div>
-            <div class="ct-tx">意见征集</div>
-        </div>
-        <div class="arrow-2"></div>
-        <div class="ct">
-            <div class="ct-3"></div>
-            <div class="ct-tx">意见反馈</div>
-        </div>
-        <div class="arrow-3"></div>
-        <div class="ct">
-            <div class="ct-4"></div>
-            <div class="ct-tx">决策完成</div>
-        </div>
-    </div>
-</div>
-<div class="main" style="margin-bottom: 20px;">
-    <div class="con">
-        <div class="search">
-            <input type="text" id="search" placeholder="请输入搜索内容">
-            <button class="search-btn">全站搜索</button>
-        </div>
-        <!--        <div class="bf-ds-ct">-->
-        <!--            <p data-id="1" style="width: 150px;height: 48px;"></p>-->
-        <!--            <p data-id="2" style="width: 150px;height: 48px;"></p>-->
-        <!--        </div>-->
-
-        <ul class="yearChioce">
-            <li class="year active" data-id="1">
-                <div class="num">2022</div>
-                <img class="diamond" src="img/lingxing-c.png">
-            </li>
-            <li class="year" data-id="2">
-                <div class="num">2021</div>
-                <img class="diamond" src="img/lingxing.png"></img>
-            </li>
-            <img class="line" src="img/line1.png" style="width: 100%;height: 2px">
-        </ul>
-
-        <div class="ly-first 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">
-            <!--            <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="foot"></div>
-    </div>
+</body>
+<script src="js/jquery-3.5.1.min.js"></script>
+<script type="text/javascript">
+    setFooter()
 
-</div>
-<script defer async type="text/javascript" src="//gov.govwza.cn/dist/aria.js?appid=f9d6e7b3fdc3e0b4b98ceccb24f22aa7" charset="utf-8" wapForceOldFixed="false" loadData="false" id="ariascripts"></script>
-<script type="text/javascript" src="./layui/layui.js"></script>
-<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="../constans.js"></script>
-<script type="text/javascript" src="./js/decision.js"></script>
-<script id="_trs_ta_js" src="//ta.trs.cn/c/js/ta.js?mpid=3973" async="async" defer="defer"></script>
-<script>
-    function isMobileUserAgent() {
-        return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
-            window.navigator.userAgent.toLowerCase()
-        );
+    function setFooter(){
+        $("#footer").load("https://www.cqna.gov.cn/ggbf_search/ggyr/2022foot/foot.html")
     }
-</script>
-<script>
-    layui.use(['table', 'layer'], function () {
-        if (isMobileUserAgent()) {
-            location.href = "decisionmobile.html";
-        }
-        var layer = layui.layer,
-            $ = layui.jquery,
-            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');
-            }
-            var tapsTitleLi = $('.yearChioce li');
-            tapsTitleLi.removeClass('active');
-            $(this).addClass('active');
-            var tapimg = $('.yearChioce .diamond');
-
-            tapsTitleLi.each(function (index) {
-                var classStr = $(this).attr('class');
-                if (classStr.indexOf('active') != -1) {
-                    tapsIndex = index;
-                }
-            });
-
-            tapimg.each(function (index) {
-                if (tapsIndex == index) {
-                    $(this).attr('src','img/lingxing-c.png');
-                } else {
-                    $(this).attr('src','img/lingxing.png');
-                }
-            })
-            layui.table.resize();//表格重新计算宽度
-        });
-        var opra = function (data) {
-            var btn = "";
-            btn += '<a style="color:#b48d44" href="details.html?id=' + data.id + '" target="_blank">' + data.postTitle
-                + '</a>';
-            return btn;
-        }
 
-        var timeFormat = function (data) {
-            var date = data.opinionFeedbackEnd.split(" ")[0];
-            var year = date.split("-")[0];
-            var month = Number(date.split("-")[1]);
-            var btn = "";
-            btn += '<div>' + year + '年' + month + '月'
-                + '</div>';
-            return btn;
-        }
-
-        var typeFormat = function (data) {
-            var conName = "";
-            switch (data.type) {
-                case 0:
-                    conName = '决策公示';
-                    break;
-                case 1:
-                    conName = '意见征集';
-                    break;
-                case 2:
-                    conName = '意见反馈';
-                    break;
-                case 3:
-                    conName = '待公示';
-                    break;
-                case 4:
-                    conName = '决策完成';
-                    break;
-                default:
-                    conName = '';
-                    break;
-            }
-            return '<div>' + conName + '</div>';
-        }
+</script>
 
-        //展示已知数据
-        table.render({
-            elem: '#tableData'
-            ,url: PATH + '/postManagement/queryAllImportmentByYear?year=2022'
-            , 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: '#tableData1'
-            ,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 //每页默认显示的数量
-        });
-    });
-</script>
-</body>
-</html>
+</html>

+ 1 - 1
nngkxxdp/src/main/resources/static/zdjc/js/decision.js

@@ -1,5 +1,5 @@
 $('.head').load('head.html')
-$('.foot').load('foot.html')
+// $('.foot').load('foot.html')
 var startPgaeNum = 0;
 var countNum = 0;
 var chanceDate = {