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

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>
@@ -587,7 +587,7 @@
             <div class="buttonList">
                 <div class="button" @click="goToLink('https://www.cqna.gov.cn/syygapi/naxsb/wyyy.html')">延时办</div>
                 <div class="button" @click="goToLink('https://www.cqna.gov.cn/syygapi/naxsb/wybdb.html')">帮代办</div>
-                <div class="button" @click="goToLink('https://www.cqna.gov.cn/syygapi/naxsb/qysmzq.html')">生命周期</div>
+                <div class="button" @click="goToLink('https://www.cqna.gov.cn/ykb_254/')">主题服务</div>
                 <div class="button" @click="goToLink('https://www.cqna.gov.cn/zwgk_254/zfxxgkml/msjxjsbmp/index.html')">
                     免申即享</div>
                 <div class="button" @click="goToLink('https://www.cqna.gov.cn/ghwd/znwd/index.html')">智能问答</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/qjt.html

@@ -714,7 +714,7 @@
       const noyear=date.getFullYear()
       console.log(noMonth%7);
       const currWeekTaskNumElement = document.getElementById('currWeekTaskNum');
-      if(nowWeek>5){
+      if(nowWeek>5||nowWeek===0){
         animateValue(currWeekTaskNumElement, 0, 5*324, time);
       }else{
         animateValue(currWeekTaskNumElement, 0, nowWeek*324, time);
@@ -730,7 +730,6 @@
     // //本年加载
     // var data = handlingNumber(1, 3)
     // // 本年办理数量
-    console.log(date.getMonth());
     const month=date.getMonth()
     const currYearTaskNumElement = document.getElementById('currYearTaskNum');
     animateValue(currYearTaskNumElement, 0, ((month*22)*324)+(((parseInt(noMonth/7))*5+noMonth%7)*324), time);

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>

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

@@ -269,7 +269,12 @@
                     <div v-if="ztcrDetail.addr"><span>详细地址：</span><span>{{ztcrDetail.addr?ztcrDetail.addr:'-'}}</span>
                     </div>
                     <div v-if="ztcrDetail.contactName">
-                        <span>联系方式：</span><span>{{ztcrDetail.contactName?ztcrDetail.contactName:'-'}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span>
+                        <span>联系方式：</span>
+                        <span v-show="ztcrDetail.contactNameList">
+                            <span v-for="(item,index) in ztcrDetail.contactNameList">{{item}}&nbsp;&nbsp;{{ztcrDetail.contactPhoneList[index]}}&nbsp;&nbsp;</span>
+                        </span>
+                        <span v-show="!ztcrDetail.contactNameList">
+                        <span>{{ztcrDetail.contactName?ztcrDetail.contactName:'-'}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span></span>
                     </div>
                 </div>
             </div>
@@ -282,9 +287,9 @@
 <script>
     $(function () {
         /*公共部分
-        * 导航栏
-        * footer CopyRight
-        */
+         * 导航栏
+         * footer CopyRight
+         */
         $(".header").load('https://www.cqna.gov.cn/syygapi/naxsb/top/top_style.html');
         $(".footer").load('https://www.cqna.gov.cn/syygapi/naxsb/footer/footer.html');
     });
@@ -344,21 +349,32 @@
                         let mdata = data.data;
                         mdata.tags = mdata.tag ? mdata.tag.split(",") : []
                         that.ztcrDetail = mdata;
+                        if(that.ztcrDetail.contactName&&that.ztcrDetail.contactName.split(',').length>1){
+                            that.ztcrDetail.contactNameList=that.ztcrDetail.contactName.split(',')
+                            that.ztcrDetail.contactPhoneList=that.ztcrDetail.contactPhone.split(',')
+                        }
                         var yqid = mdata.parkData.id;
                         if (yqid == 4) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
                         } else if (yqid == 6) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
                         } else if (yqid == 5) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
                         } else if (yqid == 3) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
                         } else if (yqid == 2) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
                         } else if (yqid == 1) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
                         } else {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
                         }
                         that.swiperList = mdata.imgUrl ? mdata.imgUrl.split(",") : [];
                         if (!that.swiperList.length) {
@@ -372,10 +388,12 @@
             },
             loadMap(points, currPoints, namePoint, centerPoint) {
                 let map = new BMap.Map("mapcontainer");
-                map.enableScrollWheelZoom();// 启用滚轮缩放
+                map.enableScrollWheelZoom(); // 启用滚轮缩放
                 map.enableDragging(); // 启用拖拽功能
                 //设定中心点和地图级别
-                if (!currPoints) { map.centerAndZoom(new BMap.Point(106.6438551, 29.480752), 17); } else {
+                if (!currPoints) {
+                    map.centerAndZoom(new BMap.Point(106.6438551, 29.480752), 17);
+                } else {
                     let pList = currPoints.split('@');
                     pList.forEach(function (point) {
                         let arr = point.split(',');