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

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

@@ -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) {