Merge branch 'nacyy' of http://116.63.33.55/git/nazw into nacyy

nngkxxdp/src/main/resources/static/naxsb/3ddemo/index.html

@@ -4,12 +4,12 @@
 		<meta charset="UTF-8" />
 		<script src="three.js"></script>
 		<script src="Detector.js"></script>
-		<script src="examples/js/libs/stats.min.js"></script>
-		<script src="examples/js/controls/OrbitControls.js"></script>
-		<script src="examples/js/loaders/GLTFLoader.js"></script>
-		<script src="examples/js/loaders/DRACOLoader.js"></script>
-		<script src="examples/js/renderers/CSS3DRenderer.js"></script>
-		<script src="examples/js/renderers/CSS2DRenderer.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/libs/stats.min.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/loaders/DRACOLoader.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/renderers/CSS3DRenderer.js"></script>
+		<script src="https://www.cqna.gov.cn/syygapi/naxsb/3ddemo/examples/js/renderers/CSS2DRenderer.js"></script>
 
 		<style>
 			body {

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

@@ -22,6 +22,7 @@
     <!-- jquery-->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/jquery-3.5.1.min.js"></script>
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/jquery-3.5.1.min.js"></script>
+    <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/urljson.js"></script>
     <style>
         * {
             padding: 0;
@@ -373,7 +374,7 @@
                     <div class="diaBox" v-if="rightdata.createWork">
                         {{rightdata.createWork?rightdata.createWork:rightdata.imgUrl}}
                     </div>
-                    <img :src="rightdata.imgUrl" style="width: 100%; height: 100%;" v-else-if="rightdata.imgUrl">
+                    <img :src="rightdata.imgUrl" style="width: 100%; height: auto;" v-else-if="rightdata.imgUrl">
 
                     </img>
                     <div v-else class="noData">暂无内容</div>

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

@@ -49,11 +49,11 @@
 
   <!-- css -->
   <!-- <link rel="stylesheet" href="https://www.cqna.gov.cn/data/footer/index/swiper.min.css"> -->
-  <link rel="stylesheet" type="text/css" href="./footer/public2022.css">
+  <link rel="stylesheet" type="text/css" href="https://www.cqna.gov.cn/syygapi/naxsb/footer/public2022.css">
   <!--  <style src="../public2022.css"></style>-->
   <!-- script -->
   <!--  <script src="https://www.cqna.gov.cn/data/footer/index/jquery-1.11.3.min.js"></script>-->
-  <script src="https://www.cqna.gov.cn/data/footer/index/jquery-3.5.1.min.js"></script>
+  <script src="https://www.cqna.gov.cn/syygapi/naxsb/footer/index/jquery-3.5.1.min.js"></script>
   <!-- <script src="https://www.cqna.gov.cn/data/footer/index/swiper.min.js"></script> -->
 </head>
 
@@ -61,7 +61,7 @@
   <a id="ariaTipText" role="pagedescription"
     aria-label="欢迎进入 重庆市南岸区人民政府网,盲人用户使用操作智能引导，请按快捷键Ctrl+Alt+R；阅读详细操作说明请按快捷键Ctrl+Alt+问号键。" aria-atomic="true"
     href="javascript:void(0)" class="skipAutoFix" style="width: 1px; height: 1px;"><img
-      src="https://www.cqna.gov.cn/ggbf_search/ggyr/2022foot/foot.html"
+      src="https://www.cqna.gov.cn/syygapi/naxsb/footer/footer.html"
       style="width:1px !important;height:1px !important;position:absolute;top:0;"></a>
   <style>
     .pFoot-link .link-ul li {

nngkxxdp/src/main/resources/static/naxsb/footer/public2022.css

@@ -264,7 +264,7 @@ textarea {
     width: 22px;
     position: relative;
     float: left;
-    background: url(2022-pTop-wechat-ico.png) center no-repeat;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-wechat-ico.png) center no-repeat;
     background-size: contain;
     cursor: pointer;
     margin-top: 4px;
@@ -349,7 +349,7 @@ textarea {
 .pBanner {
     width: 100%;
     height: 620px;
-    background: url(2022-pTop-bg-index.jpg) no-repeat center top #ecf5fd;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-bg-index.jpg) no-repeat center top #ecf5fd;
     background-size: 100%;
     position: relative;
 }
@@ -703,7 +703,7 @@ textarea {
 }
 
 .ztTop .pTop .wechat {
-    background-image: url(2022-pTop-wechat-ico.png);
+    background-image: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-wechat-ico.png);
     opacity: .8;
 }
 
@@ -815,7 +815,7 @@ textarea {
 }
 
 .pTop .top-left .gh {
-    background: url(2022-pTop-bmjz-gh.png) no-repeat left;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-bmjz-gh.png) no-repeat left;
     background-size: 15px auto;
     padding-left: 20px;
     display: none;
@@ -826,12 +826,12 @@ textarea {
 }
 
 .bmjzTop .pTop .wechat {
-    background-image: url(2022-pTop-wechat-ico02.png);
+    background-image: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-wechat-ico02.png);
 }
 
 .bmjzTop .pBanner {
     height: 160px;
-    background-image: url(2022-pTop-bg-bmjz.jpg);
+    background-image: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pTop-bg-bmjz.jpg);
     background-size: 100% 100%;
     position: relative;
 }
@@ -892,7 +892,7 @@ textarea {
     position: absolute;
     right: 0;
     bottom: 0;
-    background: url(2022-bmjzNav-bg.png) no-repeat left;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-bmjzNav-bg.png) no-repeat left;
     background-size: 821px auto;
 }
 
@@ -1024,7 +1024,7 @@ textarea {
     cursor: pointer;
     display: inline-block;
     padding-right: 25px;
-    background: url(2022-pFoot-select-ico.png) no-repeat right center;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pFoot-select-ico.png) no-repeat right center;
 }
 
 .pFoot-link .link-ul li .link-con {
@@ -1123,7 +1123,7 @@ textarea {
 }
 
 .pFoot-btm .msg a.ga {
-    background: url(../footer/index/2022-pFoot-ico-ga.png) no-repeat left;
+    background: url(https://www.cqna.gov.cn/syygapi/naxsb/footer/index/2022-pFoot-ico-ga.png) no-repeat left;
     background-size: 18px auto;
     padding-left: 25px;
 }

nngkxxdp/src/main/resources/static/naxsb/top/top_style.html

@@ -28,21 +28,21 @@
     </title>
 
     <!-- css -->
-    <link rel="stylesheet" href="./top/images/swiper.min.css" />
-    <link rel="stylesheet" href="./top/images/public2022.css" />
+    <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/top/images/swiper.min.css" />
+    <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/top/images/public2022.css" />
 
     <!-- script -->
-    <script src="./top/images/jquery-1.11.3.min.js"></script>
-    <script src="./top/images/swiper.min.js"></script>
+    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/jquery-1.11.3.min.js"></script>
+    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/swiper.min.js"></script>
 </head>
 
 <body>
     <div class="listTop list">
-        <link rel="stylesheet" href="./top/cqs/layui/css/modules/layer/default/layer.css?v=3.1.1">
-        <script src="./top/cqs/laydate/laydate.min.js"></script>
-        <script src="./top/cqs/layui/layui.all.js"></script>
-        <link rel="stylesheet" href="./top/images/xcConfirm.css">
-        <script src="./top/images/xcConfirm.js"></script>
+        <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/top/cqs/layui/css/modules/layer/default/layer.css?v=3.1.1">
+        <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/cqs/laydate/laydate.min.js"></script>
+        <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/cqs/layui/layui.all.js"></script>
+        <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/top/images/xcConfirm.css">
+        <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/xcConfirm.js"></script>
         <style>
             .pagination a.active {
                 color: #fff;
@@ -53,8 +53,8 @@
                 position: static;
             }
         </style>
-        <link rel="stylesheet" href="./top/images/xcConfirm.css">
-        <script src="./top/images/xcConfirm.js"></script>
+        <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/top/images/xcConfirm.css">
+        <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/xcConfirm.js"></script>
         <div class="pTop">
             <div class="mainWidth">
                 <div class="top-left">
@@ -70,7 +70,7 @@
                             onblur="if(this.value==''){this.value='搜索您想了解的政策/资讯/服务';}" placeholder="搜索您想了解的政策/资讯/服务" />
                         <div class="searchbtn" onclick="submitsearch02()">
                             <span>搜索</span>
-                            <img src="./top/images/2022-pBanner-searchico.png" />
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/2022-pBanner-searchico.png" />
                         </div>
                         <script>
                             function submitsearch02() {
@@ -109,17 +109,17 @@
                         sandbox="allow-same-origin allow-top-navigation allow-forms allow-scripts" style="display:none;"
                         name="iframeTar"></iframe>
                     <div class="pTop-wechat">
-                        <img class="wechat-close" src="./top/images/2022-pTop-bmjz-close.png" />
-                        <img src="./top/images/2022-pTop-wechat-ewm01.png" />
-                        <img src="./top/images/2022-pTop-wechat-ewm02.png" />
-                        <img src="./top/images/2022-pTop-wechat-ewm03.png" />
+                        <img class="wechat-close" src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/2022-pTop-bmjz-close.png" />
+                        <img src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/2022-pTop-wechat-ewm01.png" />
+                        <img src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/2022-pTop-wechat-ewm02.png" />
+                        <img src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/2022-pTop-wechat-ewm03.png" />
                         <!-- <img src="images/2022-pTop-wechat-ewm04.png" /> -->
                     </div>
-                    <script src="./top/images/crypto-js.min.js"></script>
-                    <script src="./top/images/DECRYPT.js"></script>
-                    <script src="./top/images/ykb-request.js"></script>
-                    <script src="./top/images/ykb-api.js"></script>
-                    <script src="./top/images/ykb-base.js"></script>
+                    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/crypto-js.min.js"></script>
+                    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/DECRYPT.js"></script>
+                    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/ykb-request.js"></script>
+                    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/ykb-api.js"></script>
+                    <script src="https://www.cqna.gov.cn/syygapi/naxsb/top/images/ykb-base.js"></script>
                     <script>
                         $(function () {
                             //获取用户信息-有额外的操作可以在回调中使用

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

@@ -128,7 +128,10 @@
             display: flex;
             flex-wrap: wrap;
         }
-
+        ::-webkit-scrollbar {
+      display: none;
+      /* Chrome Safari */
+    }
         .bottom .list {
             width: 32.8%;
             height: 323px;
@@ -166,18 +169,55 @@
 
         .bottom .list .content {
             line-height: 36px;
+            overflow: auto;
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+            height: calc(100% - 30px);
+        }
+
+        .el-tabs__item:hover {
+            background-color: #fff;
+            color: #007AFF;
+            font-weight: 600;
+        }
+
+        .el-tabs__item {
+            font-size: 16px;
+            border: none;
+            background-color: #EAF1F8;
+        }
+        .el-tabs--card>.el-tabs__header .el-tabs__item {
+            height: 43px;
+            border: none;
+        }
+        .el-tabs--card>.el-tabs__header .el-tabs__nav {
+            border: none;
+            height: 43px;
+        }
+        .el-tabs__item.is-active {
+            background-color: #fff;
+            font-weight: 600;
+            color: #007AFF;
+        }
+
+        .el-tabs__header {
+            margin: 0;
+        }
+        .el-tabs--card>.el-tabs__header {
+            border: none;
+            height: 43px;
         }
     </style>
 </head>
 
 <body>
     <div style="width:100%;" class="header"></div>
-    <div class="tsfw" id="tsfw">
+    <div class="tsfw" id="tsfw" style="            padding: 10px 0;">
         <div class="top">
-            <div class="toplogo">
-                <img src="images/gyylogo.png" alt="">
-                <span>{{currentTitle}}特色服务</span>
-            </div>
+            <el-tabs v-model="activeName" type="card" @tab-click="switchTab">
+                <el-tab-pane v-for="(item ,index) in titleList" :key="index" :label="item.title" :name="item.id">
+                </el-tab-pane>
+            </el-tabs>
             <div class="backbutton" @click="window.history.go(-1)">
                 <img src="images/back1.png" alt="">
                 <span>返回</span>
@@ -259,9 +299,9 @@
 <script>
     $(function () {
         /*公共部分
-        * 导航栏
-        * footer CopyRight
-        */
+         * 导航栏
+         * footer CopyRight
+         */
         $(".header").load('top/top_style.html');
         $(".footer").load('footer/footer.html');
     });
@@ -275,13 +315,28 @@
                 reqPtah: '',
                 // reqPtah: 'http://172.16.99.105:8082',
                 leftList: [],
+                titleList: [],
                 person: '',
                 telphone: '',
                 address: '',
-                currentTitle: ''
+                currentTitle: '',
+                activeName: ''
             };
         },
         methods: {
+            switchTab(val) {
+                console.log(val);
+
+                this.activeName = val.name
+                this.getParkData(val.name);
+            this.getDetailData(val.name);
+                // const arr = document.querySelectorAll('.mainTab>span')
+                // arr.forEach(item => {
+                //   item.classList.remove('activeTab')
+                //   arr[val - 1].classList.add('activeTab')
+                // })
+
+            },
             getDetailData(id) {
                 let that = this;
                 $.ajax({
@@ -296,6 +351,27 @@
             getParkData(id) {
                 let that = this;
                 $.ajax({
+                    url: conpath + "/parkData/",
+                    type: "get",
+                    dataType: "json",
+                    async: false,
+                    success: function (data) {
+                        const arr = []
+                        data.forEach(function (item) {
+                            item.subtitleList = item.subtitle ? item.subtitle.split(",")
+                                .slice(0, 3) : [];
+                        })
+                        that.titleList = data;
+                        if (id) {
+                            that.activeName = Number(id)
+                        } else {
+                            that.activeName = that.titleList[0].id
+                        }
+                        console.log(id,that.activeName);
+                        
+                    }
+                })
+                $.ajax({
                     url: conpath + "/specialService/list/" + id,
                     type: "get",
                     dataType: "json",
@@ -307,11 +383,19 @@
                         let value = data.data;
                         let newList = []
                         value.forEach(item => {
-                            let status = newList.find(el => el.parkForm === item.parkForm) // 判断第一层级，用name属性来判断
+                            let status = newList.find(el => el.parkForm === item
+                                .parkForm) // 判断第一层级，用name属性来判断
                             if (status) {
-                                status.children.push({ ...item }) // 将数据插入到第二层级中
+                                status.children.push({
+                                    ...item
+                                }) // 将数据插入到第二层级中
                             } else {
-                                let obj = { ...item, children: [{ ...item }] }
+                                let obj = {
+                                    ...item,
+                                    children: [{
+                                        ...item
+                                    }]
+                                }
                                 newList.push(obj)
                             }
                         })