ditu

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

@@ -73,18 +73,17 @@
 
     #map {
       width: 60%;
-      height: calc(100% - 10px);
+      /* height: calc(100% - 10px); */
       margin-top: 10px;
     }
 
     .contentR {
       width: calc(40% - 10px);
-      /* height: 100%; */
+      /* height: 900px; */
     }
 
     .contentBox {
-      padding-top: 20px;
-      height: 900px;
+      height: 937px;
       width: 100%;
       display: grid;
       grid-template-columns: 1fr 1fr;
@@ -114,20 +113,23 @@
       padding: 20px 0;
       font-size: 20px;
     }
-    
+
     /* .mainTab>span:hover {
       font-weight: bold;
     } */
-    .el-tabs__item{
+    .el-tabs__item {
       color: #fff;
       font-size: 18px;
+      border: none !important;
     }
     .el-tabs--card>.el-tabs__header .el-tabs__nav {
       border: none;
     }
-    .el-tabs__nav-next, .el-tabs__nav-prev {
+    .el-tabs__nav-next,
+    .el-tabs__nav-prev {
       color: #fff;
     }
+
     .activeTab {
       background-color: rgba(0, 0, 0, .4) !important;
       font-weight: bold;
@@ -146,14 +148,16 @@
     /* .mainTab>span:hover {
       font-weight: bold;
     } */
-    .el-tabs__item:hover{
+    .el-tabs__item:hover {
       color: #fff;
       font-weight: 600;
     }
+
     .el-tabs__item.is-active {
       color: #fff;
       font-weight: 600;
     }
+
     .activeTab {
       background-color: rgba(0, 0, 0, .4) !important;
       font-weight: bold;
@@ -201,6 +205,7 @@
       width: 100%;
       overflow: hidden;
     }
+
     .tdgyC {
       display: flex;
       flex-wrap: wrap;
@@ -218,14 +223,16 @@
       box-sizing: border-box;
       overflow: hidden;
     }
+
     .ztfwC {
       width: 100%;
       overflow-y: auto;
       -ms-overflow-style: none;
-      scrollbar-width: none;      
+      scrollbar-width: none;
       display: flex;
       flex-wrap: wrap;
     }
+
     .tdgyList {
       display: flex;
       border-bottom: 1px solid rgba(245, 250, 255, .2);
@@ -507,11 +514,11 @@
           <div class="contentItem">
             <!-- <div class="mainTab"><span class="activeTab" @click="switchTab(1)">区位条件</span><span
                 @click="switchTab(2)">创新优势</span><span @click="switchTab(3)">产业特色</span></div> -->
-                <el-tabs v-model="activeName" type="card" @tab-click="switchTab">
-                  <el-tab-pane label="区位条件" name="1"></el-tab-pane>
-                  <el-tab-pane label="创新优势" name="2"></el-tab-pane>
-                  <el-tab-pane label="产业特色" name="3"></el-tab-pane>
-                </el-tabs>
+            <el-tabs v-model="activeName" type="card" @tab-click="switchTab">
+              <el-tab-pane label="区位条件" name="1"></el-tab-pane>
+              <el-tab-pane label="创新优势" name="2"></el-tab-pane>
+              <el-tab-pane label="产业特色" name="3"></el-tab-pane>
+            </el-tabs>
             <div class="main">
               <div v-show="this.activeName==='1'">
                 <li title="15分钟直达江北国际机场，20分钟可抵重庆西部物流园"><img src="image/listcricle.png" />15分钟直达江北国际机场，20分钟可抵重庆西部物流园</li>
@@ -533,8 +540,10 @@
                 </el-tab-pane> -->
               <div v-show="this.activeName==='3'">
                 <li title="2023年地区生产总值增长6.7%，居中心城区第一"><img src="image/listcricle.png" />2023年地区生产总值增长6.7%，居中心城区第一</li>
-                <li title="加快构建智能终端、软件信息服务、大健康3个1000亿级主导产业体系"><img src="image/listcricle.png" />加快构建智能终端、软件信息服务、大健康3个1000亿级主导产业体系</li>
-                <li title="加快构建节能环保、汽车电子2个500亿级特色支柱产业体系"><img src="image/listcricle.png" />加快构建节能环保、汽车电子2个500亿级特色支柱产业体系</li>
+                <li title="加快构建智能终端、软件信息服务、大健康3个1000亿级主导产业体系"><img
+                    src="image/listcricle.png" />加快构建智能终端、软件信息服务、大健康3个1000亿级主导产业体系</li>
+                <li title="加快构建节能环保、汽车电子2个500亿级特色支柱产业体系"><img src="image/listcricle.png" />加快构建节能环保、汽车电子2个500亿级特色支柱产业体系
+                </li>
                 <li title="长嘉汇金融中心"><img src="image/listcricle.png" />长嘉汇金融中心</li>
                 <li title="国际消费中心城市中心区"><img src="image/listcricle.png" />国际消费中心城市中心区</li>
                 <li title="重庆脑与智能科学中心"><img src="image/listcricle.png" />重庆脑与智能科学中心</li>
@@ -558,8 +567,8 @@
               <span class="text">园区列表</span>
             </div>
             <div class="yqlb">
-              <div class="mainList" v-for="(tab, index)  in this.titleList" @click="golink(`dqfwNews.html?id=${tab.id}`)"
-                :key="index">&nbsp;{{tab.title}}</div>
+              <div class="mainList" v-for="(tab, index)  in this.titleList"
+                @click="golink(`dqfwNew.html?id=${tab.id}`)" :key="index">&nbsp;{{tab.title}}</div>
             </div>
           </div>
           <div class="contentItem" style="background:url(image/tdgybg.png) no-repeat;background-size: 100% 100%;">
@@ -569,17 +578,17 @@
             </div>
             <div class="tdgy">
               <div class="tdgyC">
-              <div :data="contentList" class="tdgyList" v-for="(tab, index)  in this.contentList"
-                @click="golink('tdcr.html?tdid=' + tab.id)" :key="index">
-                <img src="image/listcricle.png" />
-                <div class="tdgyContent">
-                  <div class="tdgyTitle">{{tab.landName}}</div>
-                  <div class="tdgyDec">{{tab.landArea}}亩&nbsp;丨&nbsp;{{tab.landFunction}}</div>
-                  <div class="tdgyLocation"><i class="el-icon-location"></i>{{tab.addr}}</div>
+                <div :data="contentList" class="tdgyList" v-for="(tab, index)  in this.contentList"
+                  @click="golink('tdcr.html?tdid=' + tab.id)" :key="index">
+                  <img src="image/listcricle.png" />
+                  <div class="tdgyContent">
+                    <div class="tdgyTitle">{{tab.landName}}</div>
+                    <div class="tdgyDec">{{tab.landArea}}亩&nbsp;丨&nbsp;{{tab.landFunction}}</div>
+                    <div class="tdgyLocation"><i class="el-icon-location"></i>{{tab.addr}}</div>
+                  </div>
                 </div>
               </div>
             </div>
-            </div>
           </div>
           <div class="contentItem" style="background:url(image/ztfwbg.png) no-repeat;background-size: 100% 100%;">
             <div class="title">
@@ -588,16 +597,16 @@
             </div>
             <div class="ztfw">
               <div class="ztfwC">
-              <div class="ztfwList" v-for="(tab, index)  in this.buildList"
-                @click="golink('ztcrdetail.html?ztid=' + tab.id)" :key="index">
-                <img src="image/listcricle.png" />
-                <div class="tdgyContent">
-                  <div class="tdgyTitle">{{tab.carrierName}}</div>
-                  <div class="tdgyDec">{{tab.space}}亩&nbsp;丨&nbsp;{{tab.parkData.title}}</div>
+                <div class="ztfwList" v-for="(tab, index)  in this.buildList"
+                  @click="golink('ztcrdetail.html?ztid=' + tab.id)" :key="index">
+                  <img src="image/listcricle.png" />
+                  <div class="tdgyContent">
+                    <div class="tdgyTitle">{{tab.carrierName}}</div>
+                    <div class="tdgyDec">{{tab.space}}亩&nbsp;丨&nbsp;{{tab.parkData.title}}</div>
+                  </div>
                 </div>
               </div>
             </div>
-            </div>
           </div>
           <div class="contentItem" style="background:url(image/yqfwbg.png) no-repeat;background-size: 100% 100%;">
             <div class="title">
@@ -654,7 +663,7 @@
     methods: {
       switchTab(val) {
         console.log(val);
-        
+
         this.activeName = val.name
         // const arr = document.querySelectorAll('.mainTab>span')
         // arr.forEach(item => {
@@ -721,12 +730,12 @@
               strokeOpacity: 1,
               strokeStyle: "dashed",
               fillColor: "#4B98F6",
-              fillOpacity: 0.3
+              fillOpacity: 0.2
             });
             // 将多边形添加到地图中
             map.addOverlay(polygon);
             var allpointList = that.titleList;
-            console.log(allpointList)
+
             var polygon1, polygon2, polygon3, polygon4, polygon5;
             var resultlist = [];
             for (var i = 0; i < allpointList.length; i++) {
@@ -746,11 +755,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon1.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[0].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[0].id;
             });
             map.addOverlay(polygon1);
             // 创建多边形
@@ -760,11 +769,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon2.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[1].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[1].id;
             });
             // 将多边形添加到地图中
             map.addOverlay(polygon2);
@@ -774,11 +783,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon3.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[2].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[2].id;
             });
             map.addOverlay(polygon3);
             polygon4 = new BMap.Polygon(resultlist[3], {
@@ -787,11 +796,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon4.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[3].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[3].id;
             });
             map.addOverlay(polygon4);
             polygon5 = new BMap.Polygon(resultlist[4], {
@@ -800,11 +809,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon5.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[4].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[4].id;
             });
             map.addOverlay(polygon5);
             polygon6 = new BMap.Polygon(resultlist[5], {
@@ -813,11 +822,11 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
 
             polygon6.addEventListener('click', function () {
-              window.location.href = 'dqfwNews.html?id=' + allpointList[5].id;
+              window.location.href = 'dqfwNew.html?id=' + allpointList[5].id;
             });
             map.addOverlay(polygon6);
 
@@ -873,13 +882,14 @@
             that.buildList = dataList;
           }
         });
-        var height = document.querySelector('.tdgyList')?document.querySelector('.tdgyList').clientHeight:0;
+        var height = document.querySelector('.tdgyList') ? document.querySelector('.tdgyList').clientHeight : 0;
         console.log(height);
-        if(this.contentList.length){
-        this.addKeyFrames(height * this.contentList.length);}
-        var height1 = document.querySelector('.ztfwList').clientHeight?document.querySelector('.ztfwList'):0;
+        if (this.contentList.length) {
+          this.addKeyFrames(height * this.contentList.length);
+        }
+        var height1 = document.querySelector('.ztfwList').clientHeight ? document.querySelector('.ztfwList') : 0;
         console.log(height1);
-        if(this.buildList.length){this.addKey(height1 * this.buildList.length);}
+        if (this.buildList.length) { this.addKey(height1 * this.buildList.length); }
       },
       addKeyFrames(y) {
         console.log(y);

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

@@ -110,7 +110,7 @@
     .yqfw {
       display: flex;
       flex-wrap: wrap;
-      padding: 3rem;
+      padding: 50px;
       flex: 1;
     }
 
@@ -135,15 +135,25 @@
     }
 
     .tdgy {
+      padding: 0 20px;
+      overflow: hidden;
+      box-sizing: border-box;
+    }
+    .tdgyC {
+      display: flex;
+      flex-wrap: wrap;
+      width: 100%;
+      overflow-y: auto;
+      -ms-overflow-style: none;
+      scrollbar-width: none;
+    }
+    .ztfwC {
       display: flex;
       flex-wrap: wrap;
-      padding: 0 20px;
       width: 100%;
       overflow-y: auto;
       -ms-overflow-style: none;
       scrollbar-width: none;
-      box-sizing: border-box;
-      height: 100%;
     }
 
     .tdgyList {
@@ -156,18 +166,60 @@
       width: 100%;
       cursor: pointer;
     }
-
+    .liList {
+      display: flex;
+      border-bottom: 1px solid rgba(245, 250, 255, .2);
+      padding: 5px 0;
+      overflow: hidden;
+      word-break: break-all;
+      white-space: nowrap;
+      width: 100%;
+      cursor: pointer;
+    }
+    .ztfwList {
+      display: flex;
+      border-bottom: 1px solid rgba(245, 250, 255, .2);
+      padding: 5px 0;
+      overflow: hidden;
+      word-break: break-all;
+      white-space: nowrap;
+      width: 100%;
+      cursor: pointer;
+    }
+    .liList:last-child {
+      display: flex;
+      border-bottom: none;
+    }
+    .ztfwList:last-child {
+      display: flex;
+      border-bottom: none;
+    }
+    .liList>img {
+      width: 20px;
+      height: 20px;
+      margin-top: 5px;
+      margin-right: 10px;
+    }
     .tdgyList:last-child {
       display: flex;
       border-bottom: none;
     }
-
+    .ztfwList:last-child {
+      display: flex;
+      border-bottom: none;
+    }
     .tdgyList>img {
       width: 20px;
       height: 20px;
       margin-top: 5px;
       margin-right: 10px;
     }
+    .ztfwList>img {
+      width: 20px;
+      height: 20px;
+      margin-top: 5px;
+      margin-right: 10px;
+    }
 
     .nodata {
       height: calc(100% - 10px);
@@ -293,7 +345,7 @@
     .title {
       display: flex;
       justify-content: space-between;
-      padding: 15px;
+      padding: 15px 20px;
       align-items: center;
       color: #FFFFFF;
       font-family: Microsoft YaHei;
@@ -489,28 +541,28 @@
                   <div class="dec">{{parkDesc?parkDesc.industry:'-'}}</div>
                 </div>
               </div> -->
-              <div class="tdgyList" v-show="parkDesc&&parkDesc.title&&parkDesc.title.length">
+              <div class="liList" v-show="parkDesc&&parkDesc.title&&parkDesc.title.length">
                 <img src="image/listcricle.png" />
                 <div class="tdgyContent">
                   <div class="tdgyTitle">区位条件</div>
                   <div class="tdgyDec">{{parkDesc?parkDesc.title:'-'}}</div>
                 </div>
               </div>
-              <div class="tdgyList" v-show="parkDesc&&parkDesc.totalArea&&parkDesc.totalArea.length">
+              <div class="liList" v-show="parkDesc&&parkDesc.totalArea&&parkDesc.totalArea.length">
                 <img src="image/listcricle.png" />
                 <div class="tdgyContent">
                   <div class="tdgyTitle">用地面积</div>
                   <div class="tdgyDec">{{parkDesc?parkDesc.totalArea:'-'}}平方公里</div>
                 </div>
               </div>
-              <div class="tdgyList" v-show="parkDesc&&parkDesc.buildArea&&parkDesc.buildArea.length">
+              <div class="liList" v-show="parkDesc&&parkDesc.buildArea&&parkDesc.buildArea.length">
                 <img src="image/listcricle.png" />
                 <div class="tdgyContent">
                   <div class="tdgyTitle">建成面积</div>
                   <div class="tdgyDec">{{parkDesc?parkDesc.buildArea:'-'}}平方公里</div>
                 </div>
               </div>
-              <div class="tdgyList" v-show="parkDesc&&parkDesc.industry&&parkDesc.industry.length">
+              <div class="liList" v-show="parkDesc&&parkDesc.industry&&parkDesc.industry.length">
                 <img src="image/listcricle.png" />
                 <div class="tdgyContent">
                   <div class="tdgyTitle">主导产业</div>
@@ -544,14 +596,15 @@
               <span class="more" @click="golink('ztcrlist.html',2)">更多>></span>
             </div>
             <div class="tdgy">
-              <div class="tdgyList" v-for="(tab, index)  in this.buildList" :key="index" @click="goZtcr(tab.id)">
+              <div class="ztfwC">
+              <div class="ztfwList" v-for="(tab, index)  in this.buildList" :key="index" @click="goZtcr(tab.id)">
                 <img src="image/listcricle.png" />
                 <div class="tdgyContent">
                   <div class="tdgyTitle">{{tab.carrierName}}</div>
                   <div class="tdgyDec">
                     {{tab.space?tab.space:''}}亩&nbsp;丨&nbsp;{{tab.addr?tab.addr:tab.application}}</div>
                 </div>
-              </div>
+              </div></div>
               <div class="nodata" v-show="!buildList.length"
                 :style="{ backgroundImage: 'url(' + ztBackgroundImage + ')'}"></div>
             </div>
@@ -674,11 +727,26 @@
           .then(response => response.json())
           .then(data => {
             var centerPoint = data.features[0].properties.center;
-
             var map = new BMap.Map("mapcontainer");
             map.enableScrollWheelZoom(); // 启用滚轮缩放
             map.enableDragging(); // 启用拖拽功能
-            map.centerAndZoom(new BMap.Point(106.651444, 29.51982), 13);
+            const id = that.id;
+            // 设定中心点和地图级别
+            if (id == 1) {
+              map.centerAndZoom(new BMap.Point(106.651444, 29.48682), 16);
+            } else if (id == 2) {
+              map.centerAndZoom(new BMap.Point(106.76723874457288, 29.595276880811712), 15);
+            } else if (id == 3) {
+              map.centerAndZoom(new BMap.Point(106.69517131217539, 29.53277313312822), 16);
+            } else if (id == 4) {
+              map.centerAndZoom(new BMap.Point(106.559829995157, 29.512581648208534), 15);
+            } else if (id == 5) {
+              map.centerAndZoom(new BMap.Point(106.72194027111843, 29.519690776940248), 16);
+            } else if (id == 6) {
+              map.centerAndZoom(new BMap.Point(106.70580793222035, 29.520020426917684), 17);
+            } else {
+              map.centerAndZoom(new BMap.Point(106.651444, 29.48682), 14);
+            }
             map.setMapType(BMAP_NORMAL_MAP);
             var pointList = data.features[0].geometry.coordinates[0][0];
             let result = [];
@@ -686,16 +754,16 @@
               result.push(new BMap.Point(point[0], point[1]));
             });
             // 创建多边形
-            let polygon = new BMap.Polygon(result, {
-              strokeColor: "#226cfb",
-              strokeWeight: 3,
-              strokeOpacity: 1,
-              strokeStyle: "dashed",
-              fillColor: "#4B98F6",
-              fillOpacity: 0.3
-            });
-            // 将多边形添加到地图中
-            map.addOverlay(polygon);
+            // let polygon = new BMap.Polygon(result, {
+            //   strokeColor: "#226cfb",
+            //   strokeWeight: 3,
+            //   strokeOpacity: 1,
+            //   strokeStyle: "dashed",
+            //   fillColor: "#4B98F6",
+            //   fillOpacity: 0.3
+            // });
+            // // 将多边形添加到地图中
+            // map.addOverlay(polygon);
             let pointList1 = that.curraddr.split('@');
             let result1 = [];
             pointList1.forEach(function (point) {
@@ -709,7 +777,7 @@
               strokeOpacity: 1,
               strokeStyle: "solid",
               fillColor: "#f76f3a",
-              fillOpacity: 1
+              fillOpacity: 0.5
             });
             // 将多边形添加到地图中
             map.addOverlay(polygon1);
@@ -717,6 +785,15 @@
           .catch(error => console.error('Error fetching JSON:', error));
 
       },
+      addKey(y) {
+        console.log(y);
+        let i = 0
+        setInterval(function () {
+          if (i >= y) return i = 0
+          i++
+          document.querySelector('.tdgyC').style.marginTop = `-${i}px`
+        }, 50);
+      },
       loadMap(points) {
         let map = new BMap.Map("mapcontainer");
         map.enableScrollWheelZoom(); // 启用滚轮缩放
@@ -772,7 +849,7 @@
         // });
         // map.addOverlay(label);
       },
-      getParkData() {
+      async getParkData() {
         let that = this;
         $.ajax({
           url: conpath + "/parkData/" + this.id,
@@ -787,7 +864,7 @@
           }
         })
         console.log(that.parkDesc)
-        $.ajax({
+        await $.ajax({
           url: conpath + "/parkData/details/" + this.id,
           type: "get",
           dataType: "json",
@@ -795,7 +872,7 @@
             that.titleList = data.filter(item => item.moduleType === "3");
           }
         });
-        $.ajax({
+        await $.ajax({
           url: conpath + "/sellLand",
           type: "post",
           contentType: 'application/json',
@@ -811,7 +888,7 @@
             that.contentList = dataList;
           }
         });
-        $.ajax({
+        await $.ajax({
           url: conpath + "/sellBuild",
           type: "post",
           contentType: 'application/json',
@@ -828,6 +905,21 @@
             that.buildList = dataList;
           }
         });
+        var height = document.querySelector('.ztfwList')?document.querySelector('.ztfwList').clientHeight:0;
+        if(this.buildList.length){
+        this.addKeyFrames(height * this.buildList.length);}
+        console.log(height,this.buildList.length);
+        var height1 = document.querySelector('.tdgyList').clientHeight?document.querySelector('.tdgyList'):0;
+        if(this.contentList.length){this.addKey(height1 * this.contentList.length);}
+      },
+      addKeyFrames(y) {
+        console.log(y);
+        let i = 0
+        setInterval(function () {
+          if (i >= y) return i = 0
+          i++
+          document.querySelector('.ztfwC').style.marginTop = `-${i}px`
+        }, 50);
       }
     }
   });

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

@@ -390,7 +390,7 @@
         }
       },
       tsmore(id) {
-        window.location.href = "dqfwNews.html?id=" + id;
+        window.location.href = "dqfwNew.html?id=" + id;
       },
       getParkData() {
         let that = this;