Merge branch 'master' of http://116.63.33.55/git/nazw

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

@@ -237,7 +237,7 @@
             </div>
             <div class="list" @click="backsw">返回室外</div>
         </div>
-        <el-dialog title="联系我们" class="global-dialog" :visible.sync="dialogVisible" width="60%"
+        <el-dialog title="窗口电话" class="global-dialog" :visible.sync="dialogVisible" width="60%"
             :before-close="handleClose" :close-on-click-modal="false">
             <div class="btable">
                 <!-- <div class="jysm">
@@ -572,12 +572,12 @@
             <div class="btn" id="vrdiv" @click="showvrdiv">VR</div>
         </div>
         <div class="zxfw">
-            <div style="color: #004A93;margin: 15px 0;">在线服务</div>
+            <div style="color: #004A93;margin: 15px 0;">特色服务</div>
             <div class="buttonList">
                 <div class="button" @click="goToLink('wyyy.html')">延时办</div>
                 <div class="button" @click="goToLink('wybdb.html')">帮代办</div>
                 <div class="button" @click="goToLink('https://www.cqna.gov.cn/ghwd/znwd/index.html')">智能问答</div>
-                <div class="button" @click="dialogVisible=true">联系我们</div>
+                <div class="button" @click="dialogVisible=true">窗口电话</div>
             </div>
         </div>
     </div>

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

@@ -219,12 +219,7 @@
                             <div class="floorcontent">
                                 <div id="pdgdfechart" style="width: 100%;height: 100%;"></div>
                             </div>
-                            <div class="text">
-                                <span style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
-                                <span>邱家湾站2B出口</span>
-                                <span>距离：800米</span>
-                                <img src="images/qjtArrow.png" alt="" style="height: 1.75rem;">
-                            </div>
+                            
                         </div>
                     </div>
                 </div>
@@ -407,6 +402,12 @@
                         div.id = child.uuid;
                         let html = '';
                         html += '<div class="building-box">';
+                        html+=`<div class="text" style="top: -15px;left: 146px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #1A95EB;">
+                                <span style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
+                                <span>邱家湾站2B出口</span>
+                                <span>距离：800米</span>
+                                <img src="images/qjtArrow.png" alt="" style="height: 1.75rem;">
+                            </div>`
                         html += '<div class="building-text">';
                         html += '<span>4号楼</span><span style="font-size: 10px;">商务打印、小卖部、食堂</span>';
                         html += '</div>';

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

@@ -499,13 +499,22 @@ border: 1px solid #4B98F6;color: #4B98F6;" @click="goToLink('qysmzq.html')">
                 });
                 // 创建多边形
                 let polygon = new BMap.Polygon(result, {
-                    strokeColor: "blue",
+                    strokeColor: "#FFD119",
                     strokeWeight: 4,
-                    strokeOpacity: 0.5,
+                    strokeOpacity: 1,
                     strokeStyle: "solid",
-                    fillColor: "#4B98F6",
+                    fillColor: "transparent",
                     fillOpacity: 0.3
                 });
+                setInterval(function () {
+                    var strColor = polygon.getStrokeColor();
+                    console.log(strColor)
+                    if (strColor == "#FFD119") {
+                        polygon.setStrokeColor('red');
+                    } else {
+                        polygon.setStrokeColor('#FFD119');
+                    }
+                }, 500)
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
 

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

@@ -225,7 +225,7 @@
                     <div><span>联系方式：</span><span>{{ tdcrDetail.contactName?tdcrDetail.contactName:'-' }}&nbsp;&nbsp;{{ tdcrDetail.contactPhone
                             }}</span></div>
                 </div>
-                <div class="buttontz"><span>我要投资</span></div>
+                <!-- <div class="buttontz"><span>我要投资</span></div> -->
                 <div class="title">
                     <img src="images/gyy-title1.png" alt="">
                     <span>概况</span>
@@ -303,15 +303,24 @@
                     let arr = point.split(',');
                     result.push(new BMap.Point(arr[0], arr[1]));
                 });
-                // 创建多边形
-                let polygon = new BMap.Polygon(result, {
-                    strokeColor: "#3d9bee",
+               // 创建多边形
+               let polygon = new BMap.Polygon(result, {
+                    strokeColor: "#4BB664",
                     strokeWeight: 4,
-                    strokeOpacity: 0.5,
+                    strokeOpacity: 1,
                     strokeStyle: "solid",
-                    fillColor: "#4B98F6",
+                    fillColor: "transparent",
                     fillOpacity: 0.3
                 });
+                setInterval(function () {
+                    var strColor = polygon.getStrokeColor();
+                    console.log(strColor)
+                    if (strColor == "#4BB664") {
+                        polygon.setStrokeColor('red');
+                    } else {
+                        polygon.setStrokeColor('#4BB664');
+                    }
+                }, 500)
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
                 // 创建文本标签

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

@@ -126,8 +126,8 @@
                     <div v-show="currtype==2">
                         <div class="typetitle">2.请选择您的载体类型</div>
                         <div class="fwhy" id="ztlx">
-                            <div class="list" :class="getClassztlx(item.name)" :key="index"
-                                v-for="(item,index) in ztlxList" :data-tab-target="item.name">{{item.name}}</div>
+                            <div class="list" :class="getClassztlx(item)" :key="index" v-for="(item,index) in ztlxList"
+                                :data-tab-target="item">{{item}}</div>
                             <div class="list ztlxbx" data-tab-target="不限">不限</div>
                         </div>
                     </div>
@@ -212,36 +212,7 @@
                         name: "医疗器械"
                     }
                 ],
-                ztlxList: [
-                    {
-                        id: 1,
-                        name: "办公楼宇"
-                    },
-                    {
-                        id: 2,
-                        name: "厂房"
-                    },
-                    {
-                        id: 3,
-                        name: "底商"
-                    },
-                    {
-                        id: 4,
-                        name: "商业"
-                    },
-                    {
-                        id: 5,
-                        name: "医药库房"
-                    },
-                    {
-                        id: 6,
-                        name: "库房"
-                    },
-                    {
-                        id: 7,
-                        name: "宿舍"
-                    }
-                ],
+                ztlxList: [],
                 zlqklist: [
                     {
                         id: 1,
@@ -274,6 +245,7 @@
                     url: conpath + "/parkData/",
                     type: "get",
                     dataType: "json",
+                    async: false,
                     success: function (data) {
                         that.titleList = data;
                     }
@@ -284,68 +256,78 @@
             },
             nextChoice() {
                 var znxz = {
-                        "productModule": this.currfwhy,
-                        "application": this.currztlx,
-                        "rent": this.currzlqk,
-                        "belong": this.currssyq,
-                        "currentPage": 1,
-                        "pageSize": 100000
-                    }
+                    "productModule": this.currfwhy,
+                    "application": this.currztlx,
+                    "rent": this.currzlqk,
+                    "belong": this.currssyq,
+                    "currentPage": 1,
+                    "pageSize": 100000
+                }
                 if (this.currtype == 4) {
-                    var data = this.getListData(znxz);
-                    if (data.length) {
-                        var selectTabs = '';
-                        if (this.currfwhy && this.currfwhy != "不限") {
-                            selectTabs = this.currfwhy
-                        }
-                        if (this.currztlx && this.currztlx != "不限") {
-                            if (selectTabs) {
-                                selectTabs = selectTabs + ',' + this.currztlx
-                            } else {
-                                selectTabs = this.currztlx;
-                            }
+                    var selectTabs = '';
+                    if (this.currfwhy && this.currfwhy != "不限") {
+                        selectTabs = this.currfwhy
+                    }
+                    if (this.currztlx && this.currztlx != "不限") {
+                        if (selectTabs) {
+                            selectTabs = selectTabs + ',' + this.currztlx
+                        } else {
+                            selectTabs = this.currztlx;
                         }
-                        if (this.currzlqk && this.currzlqk != "不限") {
-                            if (selectTabs) {
-                                selectTabs = selectTabs + ',' + this.currzlqk
-                            } else {
-                                selectTabs = this.currzlqk;
-                            }
+                    }
+                    if (this.currzlqk && this.currzlqk != "不限") {
+                        if (selectTabs) {
+                            selectTabs = selectTabs + ',' + this.currzlqk
+                        } else {
+                            selectTabs = this.currzlqk;
                         }
-                        if (this.currssyq && this.currssyq != "不限") {
-                            if (selectTabs) {
-                                selectTabs = selectTabs + ',' + this.currssyqtitle
-                            } else {
-                                selectTabs = this.currssyqtitle;
-                            }
+                    }
+                    if (this.currssyq && this.currssyq != "不限") {
+                        if (selectTabs) {
+                            selectTabs = selectTabs + ',' + this.currssyqtitle
+                        } else {
+                            selectTabs = this.currssyqtitle;
                         }
-                        const znxzString = JSON.stringify(znxz);
-                        sessionStorage.setItem('znxztabs', selectTabs);
-                        sessionStorage.setItem('znxz', znxzString);
-                        window.location.href = "znxz.html"
-                    } else {
-                        this.$message.error('当前条件下暂无载体数据，请重新选择！');
                     }
+                    const znxzString = JSON.stringify(znxz);
+                    sessionStorage.setItem('znxztabs', selectTabs);
+                    sessionStorage.setItem('znxz', znxzString);
+                    window.location.href = "znxz.html"
                 } else {
-                    var data = this.getListData(znxz);
-                    if (data.length) {
-                        this.currtype = this.currtype + 1
-                    } else {
-                        this.$message.error('当前条件下暂无载体数据，请重新选择！');
+                    var znxz = {
+                        "productModule": this.currfwhy,
+                        "application": this.currztlx,
+                        "rent": this.currzlqk,
+                        "belong": this.currssyq
                     }
+                    this.getListData(znxz);
+                    this.currtype = this.currtype + 1;
                 }
             },
             getListData(json) {
+                let that = this;
                 let dataList;
+                that.getParkData();
                 $.ajax({
-                    url: conpath + "/sellBuild/queryPageByAddr",
+                    url: "http://192.168.0.28:8443/sellBuild/newQueryOne",
                     type: "post",
                     contentType: 'application/json',
                     data: JSON.stringify(json),
                     dataType: "json",
                     async: false,
                     success: function (data) {
-                        dataList = data.list;
+                        that.ztlxList = data.data.applications;
+                        var alltitle = that.titleList;
+                        var parkdata=data.data.parkId;
+                        var nowtitle = [];
+                        for (var i = 0; i < alltitle.length; i++) {
+                            for (var j = 0; j < parkdata.length; j++) {
+                                if (alltitle[i].id == parkdata[j]) {
+                                    nowtitle.push(alltitle[i]);
+                                }
+                            }
+                        }
+                        that.titleList = nowtitle;
                     }
                 });
                 return dataList;
@@ -449,9 +431,7 @@
             }
         },
         mounted() {
-            const url = new URL(window.location.href);
-            const id = url.searchParams.get('id');
-            this.getParkData(id);
+
         }
     })
 </script>

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

@@ -241,9 +241,9 @@
                         <span>联系方式：</span><span>{{ztcrDetail.contactName?ztcrDetail.contactName:'-'}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span>
                     </div>
                 </div>
-                <div class="buttontz">
+                <!-- <div class="buttontz">
                     <span>我要投资</span>
-                </div>
+                </div> -->
                 <div class="title">
                     <img src="images/gyy-title1.png" alt="">
                     <span>概况</span>