Browse Source

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

# Conflicts:
#	nngkxxdp/src/main/resources/static/naxsb/wybdb.html
Elis 6 tháng trước cách đây
mục cha
commit
78f30d0f93

+ 0 - 1
nngkxxdp/src/main/resources/static/naxsb/dqfw.html

@@ -21,7 +21,6 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <!-- 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>
         * {

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/dqfwNew.html

@@ -15,6 +15,7 @@
   <script type="text/javascript" src="https://api.map.baidu.com/api?type=webgl&v=3.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
   </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;

+ 3 - 1
nngkxxdp/src/main/resources/static/naxsb/floorone.html

@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="https://www.cqna.gov.cn/syygapi/naxsb/css/floorcon.css">
     <!-- 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/urljson.js"></script>
 </head>
 <style>
     .container {
@@ -440,7 +441,8 @@
             </div>
             <div v-show="popupType == '2'">
                 <div class="search"><input type="text" placeholder="请输入关键字" v-model="inputValue">
-                    <div class="btn" @click="searchData(1)"><img src="https://www.cqna.gov.cn/syygapi/naxsb/images/flsearch.png" alt=""></div>
+                    <div class="btn" @click="searchData(1)"><img
+                            src="https://www.cqna.gov.cn/syygapi/naxsb/images/flsearch.png" alt=""></div>
                 </div>
                 <div class="top">
                     <div style="font-weight: bold;font-size: 1.625rem;white-space: nowrap;">{{btnName}}您可以办理:</div>

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/footer/footer.html

@@ -724,6 +724,7 @@
     }
 
     .xn-box {
+      display: none;
       position: fixed;
       right: 0;
       bottom: 144px;

+ 0 - 50
nngkxxdp/src/main/resources/static/naxsb/indexbmhqs.html

@@ -1,50 +0,0 @@
-<!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" />
-    <meta name=”SiteName” content=”重庆市南岸区人民政府”>
-    <meta name="SiteDomain" content="http://ww.cqna.gov.cn" />
-    <meta name="SiteIDCode" content="5001080014">
-    <meta name="ColumnName" content="产业园区">
-    <meta name="ColumnDescription" content="产业园区" />
-    <meta name="ColumnKeywords" content="产业园区" />
-    <meta name="ColumnType" content="产业园区" />
-    <title>产业园区-重庆市南岸区人民政府网</title>
-</head>
-<style>
-    body {
-        width: 100%;
-        height: 100%;
-        margin: 0px;
-        padding: 0px;
-    }
-</style>
-
-<body>
-    <div style="width:100%;" id="header"></div>
-    <div id="childshell"></div>
-    <div style="width:100%;" id="footer"></div>
-
-</body>
-<script src="https://www.cqna.gov.cn/syygapi/naxsb/js/jquery-3.5.1.min.js"></script>
-
-<script>
-    setContent()
-    setHeader()
-    setFooter()
-    function setContent() {
-        $("#childshell").load("qjt.html")
-    }
-    function setHeader() {
-        $("#header").load("./top/top_style.html")
-    }
-    function setFooter() {
-        $("#footer").load("./footer/footer.html")
-    }
-</script>
-
-
-</html>

+ 1 - 1
nngkxxdp/src/main/resources/static/naxsb/qjt.html

@@ -21,7 +21,7 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <script src="js/echarts.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/jquery-3.5.1.min.js"></script>
+    <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/urljson.js"></script>
     <style>
         @media screen and (max-width:1600px) {
 

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/tdcr.html

@@ -17,6 +17,7 @@
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </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>
         html,
         body {

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/tdcrlist.html

@@ -16,6 +16,7 @@
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </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>
         ul {
             padding: 0;

+ 13 - 7
nngkxxdp/src/main/resources/static/naxsb/tsfw.html

@@ -13,7 +13,7 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <!-- 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;
@@ -128,10 +128,12 @@
             display: flex;
             flex-wrap: wrap;
         }
+
         ::-webkit-scrollbar {
-      display: none;
-      /* Chrome Safari */
-    }
+            display: none;
+            /* Chrome Safari */
+        }
+
         .bottom .list {
             width: 32.8%;
             height: 323px;
@@ -186,14 +188,17 @@
             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;
@@ -203,6 +208,7 @@
         .el-tabs__header {
             margin: 0;
         }
+
         .el-tabs--card>.el-tabs__header {
             border: none;
             height: 43px;
@@ -329,7 +335,7 @@
 
                 this.activeName = val.name
                 this.getParkData(val.name);
-            this.getDetailData(val.name);
+                this.getDetailData(val.name);
                 // const arr = document.querySelectorAll('.mainTab>span')
                 // arr.forEach(item => {
                 //   item.classList.remove('activeTab')
@@ -367,8 +373,8 @@
                         } else {
                             that.activeName = that.titleList[0].id
                         }
-                        console.log(id,that.activeName);
-                        
+                        console.log(id, that.activeName);
+
                     }
                 })
                 $.ajax({

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/wybdb.html

@@ -14,6 +14,7 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <!-- 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/urljson.js"></script>
     <style>
         .topBg .topButton {
             background-image: url(images/button-bdb.png);

+ 1 - 1
nngkxxdp/src/main/resources/static/naxsb/wyyy.html

@@ -14,7 +14,7 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <!-- 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>
         .content .name {
             width: 831px;

+ 1 - 1
nngkxxdp/src/main/resources/static/naxsb/znxz.html

@@ -16,7 +16,7 @@
         src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq"></script>
     <!-- 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>
         .contentleft {
             width: 50%;

+ 1 - 1
nngkxxdp/src/main/resources/static/naxsb/znxzchoice.html

@@ -16,7 +16,7 @@
         src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq"></script>
     <!-- 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>
         .contentleft {
             width: 50%;

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/ztcrdetail.html

@@ -17,6 +17,7 @@
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </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>
         .contentleft {
             width: 50%;

+ 1 - 0
nngkxxdp/src/main/resources/static/naxsb/ztcrlist.html

@@ -16,6 +16,7 @@
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </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>
         ul {
             padding: 0;

+ 1 - 1
nngkxxdp/src/main/resources/static/naxsb/zwfwtyy.html

@@ -14,7 +14,7 @@
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <!-- 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>
         html,
         body {