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

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

@@ -12,6 +12,13 @@ ul {
 li {
     list-style: none;
 }
+
+@font-face {
+    font-family: 'DOUYU';
+    src: url('../fonts/DOUYUFONT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
 .topBg {
     width: 100%;
     height: 697px;

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

@@ -7,6 +7,13 @@ body {
     margin: 0;
     padding: 0;
 }
+
+@font-face {
+    font-family: 'DOUYU';
+    src: url('../fonts/DOUYUFONT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
 .detailDiv {
     width: 45%;
     max-width: 836px;

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

@@ -7,6 +7,13 @@ li {
     list-style: none;
 }
 
+@font-face {
+    font-family: 'DOUYU';
+    src: url('../fonts/DOUYUFONT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
+
 .toplogo {
     display: flex;
     align-items: center;

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

@@ -40,6 +40,13 @@ body {
     height: 1384px;
 }
 
+@font-face {
+    font-family: 'DOUYU';
+    src: url('../fonts/DOUYUFONT-2.OTF');
+    font-weight: normal;
+    font-style: normal;
+}
+
 .jbqk {
     display: flex;
     justify-content: space-evenly;

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

@@ -28,6 +28,13 @@
             list-style: none;
         }
 
+        @font-face {
+            font-family: 'DOUYU';
+            src: url('fonts/DOUYUFONT-2.OTF');
+            font-weight: normal;
+            font-style: normal;
+        }
+
         .backbutton {
             width: 117px;
             height: 42px;
@@ -119,7 +126,7 @@
             font-size: 26px;
             color: #FFFFFF;
             line-height: 48px;
-            text-shadow: 0px 2px 4px rgba(11, 96, 169, 0.25);
+            /* text-shadow: 0px 2px 4px rgba(11, 96, 169, 0.25); */
             background: linear-gradient(0deg, rgba(184, 225, 255, 0.98) 0%, rgba(255, 255, 255, 0.98) 100%);
             -webkit-background-clip: text;
             -webkit-text-fill-color: transparent;

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

@@ -112,9 +112,7 @@
             <div class="itemname">
                 <div>{{ztcrDetail.carrierName}}</div>
                 <div style="display: flex;">
-                    <div class="topicon">多层厂房</div>
-                    <div class="topicon">高速路口</div>
-                    <div class="topicon">证件齐全</div>
+                    <div class="topicon" v-for="(item,index) in (ztcrDetail.tag?ztcrDetail.tag.split(','):[])">{{item}}</div>
                 </div>
             </div>
             <div class="swiperimg">
@@ -123,8 +121,8 @@
                 <div class="swiper mySwiper">
                     <div class="swiper-wrapper">
                         <div class="swiper-slide list" v-for="(item,index) in swiperList"
-                            @click="imgDetail(item.bgsrc)">
-                            <img :src="item.bgsrc" alt="">
+                            @click="imgDetail(item)">
+                            <img :src="item" alt="">
                         </div>
                     </div>
                 </div>
@@ -133,29 +131,28 @@
             <div class="list">
                 <div class="listitm" style="background-color: #4EB2AD;">
                     <span>占地面积</span>
-                    <span>174.66</span>
+                    <span>{{ztcrDetail.space}}&nbsp;㎡</span>
                 </div>
                 <div class="listitm" style="background-color: #4B98F6;">
                     <span>土地用途</span>
-                    <span>软信服务业、制造业</span>
+                    <span>{{ztcrDetail.application}}</span>
                 </div>
                 <div class="listitm" style="background-color: #4BB664;">
                     <span>基础设施配套</span>
-                    <span>七通一平</span>
+                    <span>{{ztcrDetail.basicConfiguration}}</span>
                 </div>
                 <div class="listitm" style="background-color: #DFC483;">
                     <span>可招商面积</span>
-                    <span>58000</span>
+                    <span>{{ztcrDetail.usableArea}}&nbsp;㎡</span>
                 </div>
             </div>
             <div class="text">
                 <div style="align-items: flex-start;">
                     <span>主导产业：</span>
-                    <div class="icon">软信服务业</div>
-                    <div class="icon">制造业</div>
+                    <div class="icon" v-for="(item,index) in (ztcrDetail.productModule?ztcrDetail.productModule.split('、'):[])">{{item}}</div>
                 </div>
-                <div><span>详细地址：</span><span>南岸区茶园新区通江大道172号</span></div>
-                <div><span>联系方式：</span><span>李主管 13594386645</span></div>
+                <div><span>详细地址：</span><span>{{ztcrDetail.addr}}</span></div>
+                <div><span>联系方式：</span><span>{{ztcrDetail.contactName}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span></div>
             </div>
             <div class="buttontz">我要投资</div>
             <div class="title">
@@ -163,67 +160,19 @@
                 <span>概况</span>
             </div>
             <div class="gk">
-                地块紧贴国道，交通便利，地块现状是平整空地。
+                {{ztcrDetail.introduce}}
             </div>
             <div class="title">
                 <img src="images/hyy-yscb.png" alt="">
                 <span>要素成本</span>
             </div>
-            <div class="tablecon">
-                <table style="width: 100%" border="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td class="tit">水价</td>
-                            <td class="cont">2.6元/吨</td>
-                            <td class="tit">电价</td>
-                            <td class="cont">0.58-0.67元/度</td>
-                        </tr>
-                        <tr>
-                            <td class="tit">天然气价</td>
-                            <td class="cont">4.15元/立方米</td>
-                            <td class="tit">土地成本</td>
-                            <td class="cont">30万元/亩</td>
-                        </tr>
-                        <tr>
-                            <td class="tit">劳动力成本</td>
-                            <td class="cont">3500元/月/人</td>
-                            <td class="tit">出售价格</td>
-                            <td class="cont">2100-2100元/m²</td>
-                        </tr>
-                    </tbody>
-                </table>
+            <div class="tablecon" v-html="ztcrDetail.cost">
             </div>
             <div class="title">
                 <img src="images/hyy-rzyq.png" alt="">
                 <span>入住要求</span>
             </div>
-            <div class="tablecon">
-                <table style="width: 100%" border="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td class="tit">亩均投资强度</td>
-                            <td class="cont">200万元/亩</td>
-                            <td class="tit">年产值</td>
-                            <td class="cont">200万元/亩</td>
-                        </tr>
-                        <tr>
-                            <td class="tit">亩均税收</td>
-                            <td class="cont">200万元/亩</td>
-                            <td class="tit">环保要求</td>
-                            <td class="cont">入园项目必须达到国家环境保护、节能降耗、安全生产方面的有关规定和要求，杜
-                                绝“高危、高污、高耗、低效项目进入；
-                                对列入国家《环境保护综合名录》中高污
-                                染、高环境风险产品名录的项目不予准入。 </td>
-                        </tr>
-                        <tr>
-                            <td class="tit">其他要求</td>
-                            <td colspan="3">投资主体是《财富》杂志评选出的世界500强企业、中国企业联合会评选出的中国企业500强企业、
-                                全国工商联评选出的中国民营企业500强企业或细分行业龙头企业、国家高新技术企业领投的项目优先。上述所指企业均以最新数据为准。
-                                1.对承诺落实完税任务，但实际纳税不达标，愿意在投产次年起的5年内，每年年底按实际入库税额少于承诺完税金额的差额部分向管委会支付补偿款，用于补偿园区基础设施建设成本的工业项目，在符合园区产业政策、《工业项目建设用地控制指标》、安全生产、环保和节能减排要求的前提下，其他条件可放宽，并优先安排入园。
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+            <div class="tablecon" v-html="ztcrDetail.checkin">
             </div>
         </div>
         <div class="contentright" id="mapcontainer"></div>
@@ -250,20 +199,7 @@
                 reqPtah: 'http://172.16.99.105:8082',
                 ztcrDetail: {},
                 imgUrl: 'images/slide1.png',
-                swiperList: [
-                    {
-                        bgsrc: "images/slide1.png"
-                    },
-                    {
-                        bgsrc: "images/slide2.png"
-                    },
-                    {
-                        bgsrc: "images/tdcr0.png"
-                    },
-                    {
-                        bgsrc: "images/slide3.png"
-                    }
-                ],
+                swiperList: [],
             }
         },
         mounted() {
@@ -285,18 +221,47 @@
                     type: "get",
                     dataType: "json",
                     success: function (data) {
-                        that.ztcrDetail = data;
+                        let mdata = data.data;
+                        mdata.tags = mdata.tag ? mdata.tag.split(",") : []
+                        that.ztcrDetail = mdata;
 
-                        that.swiperList = data.imgUrl ? data.imgUrl.split(",") : [];
+                        that.swiperList = mdata.imgUrl ? mdata.imgUrl.split(",") : [];
                         that.imgUrl = that.swiperList[0];
-                        let points = data.parkData.addr;
-                        // that.loadMap(points, data.point);
+                        let points = mdata.parkData.addr;
+                        that.loadMap(points, mdata.point);
                     }
                 });
-            }
+            },
+            loadMap(points, currPoints) {
+                let map = new BMap.Map("mapcontainer");
+                map.enableScrollWheelZoom();// 启用滚轮缩放
+                map.enableDragging(); // 启用拖拽功能
+                // 设定中心点和地图级别
+                map.centerAndZoom(new BMap.Point(106.651444, 29.48682), 15);
+                if (!points) return;
+                let pointList = points.split('@');
+                let result = [];
+                pointList.forEach(function (point) {
+                    let arr = point.split(',');
+                    result.push(new BMap.Point(arr[0], arr[1]));
+                });
+                // 创建多边形
+                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                // 将多边形添加到地图中
+                map.addOverlay(polygon);
+
+                // 添加选择地址
+                if (!currPoints) return;
+                let pList = currPoints.split('@');
+                pList.forEach(function (point) {
+                    let arr = point.split(',');
+                    let p = new BMap.Point(arr[0], arr[1]);
+                    let marker = new BMap.Marker(p);
+                    map.addOverlay(marker);
+                });
+            },
         }
     })
 </script>
-<script type="text/javascript" src="js/rightmap.js"></script>
 
 </html>

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

@@ -151,35 +151,35 @@
                 <div class="name">片区</div>
                 <ul class="item">
                     <li v-for="(item,index) in pqList" :class="{ active: currentPq == item.id }" :key="index"
-                        @click="currentPq = item.id">{{item.title}}</li>
+                        @click="handleParkChange(item)">{{item.title}}</li>
                 </ul>
             </div>
             <div class="term">
                 <div class="name">面积</div>
                 <ul class="item">
                     <li v-for="(item,index) in mjList" :class="{ active: currentmj == item.id }" :key="index"
-                        @click="currentmj = item.id">{{item.name}}</li>
+                        @click="handleSpaceChange(item)">{{item.name}}</li>
                 </ul>
             </div>
             <div class="term">
                 <div class="name">用途</div>
                 <ul class="item">
                     <li v-for="(item,index) in ytList" :class="{ active: currentyt == item.id }" :key="index"
-                        @click="currentyt = item.id">{{item.name}}</li>
+                        @click="handleUseChange(item)">{{item.name}}</li>
                 </ul>
             </div>
             <div class="content">
-                <div class="list" v-for="(item,index) in contentList" @click="goDeteil()">
+                <div class="list" v-for="(item,index) in contentList" @click="goDeteil(item.id)">
                     <div class="left">
                         <img :src="item.imgUrl ? item.imgUrl.split(',')[0] : ''" alt="">
                     </div>
                     <div class="right">
                         <ul class="item">
                             <li><span>载体名称：</span><span>{{item.carrierName}}</span></li>
-                            <li><span>可用面积：</span><span>{{item.area}}</span></li>
+                            <li><span>可用面积：</span><span>{{item.area}}&nbsp;㎡</span></li>
                             <li><span>可用情况：</span><span>{{item.situationState == '1' ? '可用' : '不可用'}}</span></li>
                             <li><span>产业板块：</span><span>{{item.productModule}}</span></li>
-                            <li><span>所属园区：</span><span>{{item.ssyq}}</span></li>
+                            <li><span>所属园区：</span><span>{{item.parkData.title}}</span></li>
                         </ul>
                     </div>
                 </div>
@@ -195,6 +195,11 @@
         data: function () {
             return {
                 reqPtah: 'http://172.16.99.105:8082',
+                pageSize: 20,
+                parkMap: {},
+                pointList: [],
+                currSpace: '',
+                currUse: '',
                 currentPq: -1,
                 currentmj: 1,
                 currentyt: 1,
@@ -202,27 +207,33 @@
                 mjList: [
                     {
                         id: 1,
-                        name: "全部"
+                        name: "全部",
+                        value: "-1"
                     },
                     {
                         id: 2,
-                        name: "0-50m²"
+                        name: "0-50m²",
+                        value: "0,50"
                     },
                     {
                         id: 3,
-                        name: "51-100m²"
+                        name: "51-100m²",
+                        value: "51,100"
                     },
                     {
                         id: 4,
-                        name: "100-150m²"
+                        name: "101-150m²",
+                        value: "101,150"
                     },
                     {
                         id: 5,
-                        name: "150-200m²"
+                        name: "150-200m²",
+                        value: "151,200"
                     },
                     {
                         id: 6,
-                        name: "200-250m²"
+                        name: "201-250m²",
+                        value: "201,250"
                     }
                 ],
                 ytList: [
@@ -257,12 +268,68 @@
         mounted() {
             const url = new URL(window.location.href);
             const id = url.searchParams.get('id');
+            this.currentPq = id;
             this.getParkData();
-            this.getSellBuild(id);
+            this.getParkDetail();
+            this.getSellBuild();
         },
         methods: {
-            goDeteil() {
-                window.location.href = "ztcrdetail.html"
+            handleParkChange(data) {
+                this.currentPq = data.id;
+                this.getParkDetail();
+                this.getSellBuild();
+            },
+            handleSpaceChange(data) {
+                this.currentmj = data.id;
+                this.currSpace = data.value;
+                this.getSellBuild();
+            },
+            handleUseChange(data) {
+                this.currentyt = data.id;
+                this.currUse = data.name;
+                this.getSellBuild();
+            },
+            goDeteil(id) {
+                if (id) {
+                    window.location.href = "ztcrdetail.html?ztid=" + id;
+                }
+            },
+            getParkDetail() {
+                let that = this;
+                $.ajax({
+                    url: that.reqPtah + "/parkData/" + that.currentPq,
+                    type: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        that.loadMap(data.addr);
+                    }
+                });
+            },
+            loadMap(points) {
+                let that = this;
+                that.parkMap = new BMap.Map("mapcontainer");
+                that.parkMap.enableScrollWheelZoom();// 启用滚轮缩放
+                that.parkMap.enableDragging(); // 启用拖拽功能
+                // 设定中心点和地图级别
+                that.parkMap.centerAndZoom(new BMap.Point(106.651444, 29.48682), 15);
+                if (!points) return;
+                let pointList = points.split('@');
+                let result = [];
+                pointList.forEach(function (point) {
+                    let arr = point.split(',');
+                    result.push(new BMap.Point(arr[0], arr[1]));
+                });
+                // 创建多边形
+                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                // 将多边形添加到地图中
+                that.parkMap.addOverlay(polygon);
+
+                that.pointList.forEach(function (point) {
+                    let arr = point.split(',');
+                    let p = new BMap.Point(arr[0], arr[1]);
+                    let marker = new BMap.Marker(p);
+                    that.parkMap.addOverlay(marker);
+                });
             },
             getParkData() {
                 let that = this;
@@ -282,7 +349,7 @@
                     }
                 });
             },
-            getSellBuild(id) {
+            getSellBuild() {
                 let that = this;
                 $.ajax({
                     url: that.reqPtah + "/sellBuild",
@@ -291,21 +358,27 @@
                     data: JSON.stringify({
                         "currentPage": 1,
                         "pageSize": that.pageSize,
-                        "parkId": id
+                        "parkId": that.currentPq == -1 ? null : that.currentPq,
+                        "space": that.currSpace == '-1' ? null : that.currSpace,
+                        "application": that.currUse == '全部' ? null : that.currUse
                     }),
                     dataType: "json",
                     success: function (data) {
                         let dataList = data.list;
-                        // dataList.forEach(function (d) {
-                        //     d.logo = d.imgUrl ? d.imgUrl.split(",")[0] : '';
-                        // });
                         that.contentList = dataList;
+
+                        dataList.forEach(function (d) {
+                            // 添加选择地址
+                            if (!d.point) return;
+                            let pList = d.point.split('@');
+                            pList.forEach(function (point) {
+                                that.pointList.push(point);
+                            });
+                        });
                     }
                 });
             },
         }
     })
 </script>
-<script type="text/javascript" src="js/rightmap.js"></script>
-
 </html>