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

nngkxxdp/src/main/resources/static/naxsb/css/conmon.css

@@ -20,7 +20,7 @@ li {
 
 @font-face {
     font-family: 'DOUYU';
-    src: url('../fonts/DOUYUFONT-2.OTF');
+    src: url('../fonts/DOUYUFONT-2.woff');
     font-weight: normal;
     font-style: normal;
 }

nngkxxdp/src/main/resources/static/naxsb/css/floorcon.css

@@ -14,7 +14,7 @@ html {
 
 @font-face {
     font-family: 'DOUYU';
-    src: url('../fonts/DOUYUFONT-2.OTF');
+    src: url('../fonts/DOUYUFONT-2.woff');
     font-weight: normal;
     font-style: normal;
 }

nngkxxdp/src/main/resources/static/naxsb/css/mapcon.css

@@ -15,7 +15,7 @@ html {
 
 @font-face {
     font-family: 'DOUYU';
-    src: url('../fonts/DOUYUFONT-2.OTF');
+    src: url('../fonts/DOUYUFONT-2.woff');
     font-weight: normal;
     font-style: normal;
 }

nngkxxdp/src/main/resources/static/naxsb/css/qjt.css

@@ -4,12 +4,12 @@ body {
     /* 溢出隐藏 */
 }
 
-@font-face {
-    font-family: 'DOUYU';
-    src: url('../fonts/DOUYUFONT-2.OTF');
-    font-weight: normal;
-    font-style: normal;
-}
+/*@font-face {*/
+/*    !*font-family: 'DOUYU';*!*/
+/*    !*src: url('../fonts/DOUYUFONT-2.woff');*!*/
+/*    font-weight: normal;*/
+/*    font-style: normal;*/
+/*}*/
 
 #loading {
     position: absolute;

nngkxxdp/src/main/resources/static/naxsb/css/syygggy.css

@@ -75,7 +75,7 @@ html {
 
 @font-face {
   font-family: "DOUYU";
-  src: url("../fonts/DOUYUFONT-2.OTF");
+  src: url("../fonts/DOUYUFONT-2.woff");
   font-weight: normal;
   font-style: normal;
 }

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

@@ -48,7 +48,7 @@
 
     @font-face {
       font-family: 'DOUYU';
-      src: url('fonts/DOUYUFONT-2.OTF');
+      src: url('fonts/DOUYUFONT-2.woff');
       font-weight: normal;
       font-style: normal;
     }
@@ -673,7 +673,7 @@
               <span class="text">园区服务</span>
             </div>
             <div class="yqfw">
-              <div class="yqfwBox mb" @click="golink('https://www.cqna.gov.cn/syygapi/naxsb/tsfw.html?id=1')">
+              <div class="yqfwBox mb" @click="golink('https://www.cqna.gov.cn/syygapi/naxsb/tsfw.html?id=3')">
                 <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/listcricle.png" />特色服务
               </div>
               <div class="yqfwBox mb" @click="tolink('https://www.cqna.gov.cn/syygapi/naxsb/dqfw.html')">

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

@@ -39,7 +39,7 @@
 
         @font-face {
             font-family: 'DOUYU';
-            src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.OTF');
+            src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.woff');
             font-weight: normal;
             font-style: normal;
         }

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

@@ -38,7 +38,7 @@
 
     @font-face {
       font-family: 'DOUYU';
-      src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.OTF');
+      src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.woff');
       font-weight: normal;
       font-style: normal;
     }
@@ -740,14 +740,6 @@
             const id = that.id;
             map.setMapStyleV2({
               styleJson: [
-                // {
-                //     "featureType": "road",
-                //     "elementType": "all",
-                //     "stylers": {
-                //         "color": "#ffffff",
-                //         "visibility": "off"
-                //     }
-                // },
                 {
                   "featureType": "building",
                   "elementType": "all",
@@ -780,6 +772,7 @@
               map.centerAndZoom(new BMapGL.Point(106.76723874457288, 29.573276880811712), 3);
               level = 14;
             } else if (id == 3) {
+              debugger
               map.centerAndZoom(new BMapGL.Point(106.69517131217539, 29.51577313312822), 3);
               level = 15;
             } else if (id == 4) {

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

@@ -510,8 +510,8 @@
                     @click="window.open('https://www.cqna.gov.cn/vr/dating3/tour.html?startscene=6')"></div>
                 <div class="vrdiv" style="right: 284px;top: 99px;"
                     @click="window.open('https://www.cqna.gov.cn/vr/dating3/tour.html?startscene=7')"></div>
-                <div class="namebtn threed" style="left: 150px;bottom: 88px;background-color: #D97064;
-        text-shadow: 3px 1px 2px rgb(217 112 100 / 80%);" data-popupType="1">咨询台
+                <div class="namebtnl threed" style="left: 150px;bottom: 88px;background-color: #D97064;
+        text-shadow: 3px 1px 2px rgb(217 112 100 / 80%);" >咨询台
                 </div>
                 <div class="namebtn threed" style="left: 217px;bottom: 119px;" data-popupType="2" data-id="12">政务公开专区
                 </div>
@@ -804,12 +804,12 @@
             var element2 = document.getElementsByClassName('detailDiv');
             var offset2 = $('.detailDiv').offset();
             var rect = element2[0].getBoundingClientRect();
-            var height2 = rect.top;
+            var height2 = rect.top-270;
             var left2 = rect.left;
 
             //图中按钮的位置
             var rect1 = this.getBoundingClientRect();
-            var top1 = rect1.top;
+            var top1 = rect1.top-270;
             var left1 = rect1.left;
             var width1 = rect1.width;
 

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

@@ -31,7 +31,8 @@
 
     @font-face {
       font-family: 'DOUYU';
-      src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.OTF');
+      src: url('https://www.cqna.gov.cn/syygapi/naxsb/fonts/DOUYUFONT-2.woff');
+      /*src: url('http://localhost:8082/naxsb/fonts/DOUYUFONT-2.woff');*/
       font-weight: normal;
       font-style: normal;
     }

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

@@ -24,7 +24,7 @@
 
         @font-face {
             font-family: 'DOUYU';
-            src: url('fonts/DOUYUFONT-2.OTF');
+            src: url('fonts/DOUYUFONT-2.woff');
             font-weight: normal;
             font-style: normal;
         }

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

@@ -31,7 +31,7 @@
 
         @font-face {
             font-family: 'DOUYU';
-            src: url('fonts/DOUYUFONT-2.OTF');
+            src: url('fonts/DOUYUFONT-2.woff');
             font-weight: normal;
             font-style: normal;
         }

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

@@ -13,7 +13,7 @@
     <!-- 引入组件库 -->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/index.js"></script>
     <script type="text/javascript"
-        src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq"></script>
+        src="https://api.map.baidu.com/api?type=webgl&v=3.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/urljson.js"></script>
@@ -233,7 +233,19 @@
                     <div class="zwsj" v-if="!this.contentList.length">暂无数据</div>
                     <div class="list" v-for="(item,index) in contentList" @click="goDeteil(item.id)">
                         <div class="left">
-                            <img :src="item.imgUrl?item.imgUrl:backgroundImage" alt="">
+                            <img :src="item.imgUrl" alt="" v-if="item.imgUrl">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==4)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==6)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==5)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==3)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==2)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==1)">
                             <div class="number" style="" v-if="index < 10">0{{index+1}}</div>
                             <div class="number" style="" v-else>{{index+1}}</div>
                         </div>

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

@@ -17,6 +17,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/urljson.js"></script>
+    <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/rightmap.js"></script>
     <style>
         .contentleft {
             width: 50%;
@@ -451,7 +452,6 @@
         }
     })
 </script>
-<script type="text/javascript" src="https://www.cqna.gov.cn/syygapi/naxsb/js/rightmap.js"></script>
 
 <script>
     var that = this;

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

@@ -231,8 +231,21 @@
                     <div class="zwsj" v-if="!this.contentList.length"><img src="images/zwsj.png"
                             alt=""><span>暂无数据</span></div>
                     <div class="list" v-for="(item,index) in contentList" @click="goDeteil(item.id)">
+                        {{item.urln}}
                         <div class="left">
-                            <img :src="item.imgUrl ? item.imgUrl.split(',')[0] : backgroundImage" alt="">
+                            <img :src="item.imgUrl.split(',')[0]" alt="" v-if="item.imgUrl">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==4)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==6)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==5)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==3)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==2)">
+                            <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp" alt=""
+                                v-if="!item.imgUrl&&(item.belong ==1)">
                         </div>
                         <div class="right">
                             <ul class="item">
@@ -352,21 +365,6 @@
             this.getParkData();
             this.getParkDetail();
             this.getSellBuild();
-            if (id == 4) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
-            } else if (id == 6) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
-            } else if (id == 5) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
-            } else if (id == 3) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
-            } else if (id == 2) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
-            } else if (id == 1) {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
-            } else {
-                this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
-            }
         },
         methods: {
             backIndex() {
@@ -375,21 +373,6 @@
             handleParkChange(data) {
                 this.currentPq = data.id;
                 var id = data.id;
-                if (id == 4) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
-                } else if (id == 6) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
-                } else if (id == 5) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
-                } else if (id == 3) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
-                } else if (id == 2) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
-                } else if (id == 1) {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
-                } else {
-                    this.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
-                }
                 this.getSellBuild();
                 this.getParkDetail();
             },
@@ -461,7 +444,6 @@
                 // });
                 // // 将多边形添加到地图中
                 // that.parkMap.addOverlay(polygon);
-                console.log(points)
                 points.forEach(function (d) {
                     let pList = d.point.split('@');
                     pList.forEach(function (point) {
@@ -543,6 +525,7 @@
                     dataType: "json",
                     success: function (data) {
                         let dataList = data.list;
+
                         that.contentList = dataList;
                         that.pointList = [];
                         dataList.forEach(function (d) {