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

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

@@ -117,7 +117,6 @@ body {
     height: 179px;
     background: #FFFFFF;
     padding: 10px 0;
-    padding-left: 30px;
     box-sizing: border-box;
     overflow-y: scroll;
 }
@@ -126,11 +125,11 @@ body {
     height: 0px;
 }
 
-.yqhd ul {
+.yqhd>ul {
     height: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: space-evenly;
+    margin-left: 30px;
 }
 .yqhd ul li{
     cursor: pointer;
@@ -164,7 +163,6 @@ body {
     height: 185px;
     background: #FFFFFF;
     padding: 10px 0;
-    padding-left: 30px;
     box-sizing: border-box;
     overflow-y: scroll;
 }
@@ -173,11 +171,11 @@ body {
     height: 0px;
 }
 
-.zcwj ul {
+.zcwj>ul {
     height: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: space-evenly;
+    margin-left: 30px;
 }
 .zcwj li{
     margin-bottom: 10px;
@@ -200,10 +198,10 @@ body {
     background: #FFFFFF;
     display: flex;
     align-items: center;
-    justify-content: space-evenly;
 }
 .ztcr .list{
     cursor: pointer;
+    margin-left: 3px;
 }
 
 .ztcr .list .bg {

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

@@ -21,6 +21,14 @@
             width: 50vw;
             height: 1384px;
         }
+
+        .zwsj {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
     </style>
 </head>
 
@@ -39,15 +47,15 @@
                 <div class="jbqk">
                     <div class="list" style="background-image: url(images/jbqk1.png);">
                         <p>总面积</p>
-                        <p><span>{{this.jbqk.totalArea}}</span><span>平方公里</span></p>
+                        <p><span>{{this.jbqk.totalArea?this.jbqk.totalArea:'- '}}</span><span>平方公里</span></p>
                     </div>
                     <div class="list" style="background-image: url(images/jbqk2.png);">
                         <p>建成面积 </p>
-                        <p><span>{{this.jbqk.buildArea}}</span><span>平方公里</span></p>
+                        <p><span>{{this.jbqk.buildArea?this.jbqk.buildArea:'- '}}</span><span>平方公里</span></p>
                     </div>
                     <div class="list" style="background-image: url(images/jbqk3.png);">
                         <p>产业分布</p>
-                        <span>{{this.jbqk.industry}}</span>
+                        <span>{{this.jbqk.industry?this.jbqk.industry:'- '}}</span>
                     </div>
                 </div>
                 <div class="title">
@@ -55,7 +63,8 @@
                     <span>区位优势</span>
                 </div>
                 <div class="qwys" style="height: 179px;">
-                    <div class="list" v-for="(item,index) in this.qwysList">
+                    <div class="zwsj" v-if="!this.qwysList.length">暂无数据</div>
+                    <div class="list" v-for="(item,index) in this.qwysList" v-else>
                         <div class="name">
                             <img :src="item.logo" alt="">
                             <span>{{item.title}}</span>
@@ -74,7 +83,8 @@
                             <span>园区活动</span>
                         </div>
                         <div class="yqhd">
-                            <ul>
+                            <div class="zwsj" v-if="!this.yqhdList.length">暂无数据</div>
+                            <ul v-else>
                                 <li v-for="(item,index) in yqhdList">{{item.title}}</li>
                             </ul>
                         </div>
@@ -85,7 +95,8 @@
                             <span>明星企业</span>
                         </div>
                         <div class="mxqy">
-                            <ul>
+                            <div class="zwsj" v-if="!this.mxqyList.length">暂无数据</div>
+                            <ul v-else>
                                 <li v-for="(item,index) in mxqyList">
                                     <img :src="item.logo" alt="">
                                 </li>
@@ -105,16 +116,19 @@
                                     <div>{{item.title}}</div>
                                 </li>
                             </ul>
+                            <div class="zwsj" v-else>暂无数据</div>
                         </div>
                         <div class="title" style="display: flex;justify-content: space-between;">
                             <div style="display: flex;align-items: center;">
                                 <img src="images/gyy-title6.png" alt="">
                                 <span>载体出让</span>
                             </div>
-                            <div class="more" @click="ztcrmore">更多>></div>
+                            <div class="more" @click="ztcrmore" v-if="this.ztcrList.length">更多>></div>
                         </div>
                         <div class="ztcr">
-                            <div class="list" v-for="(item,index) in ztcrList" @click="goToLink('ztcrdetail.html?ztid=' + item.id)">
+                            <div class="zwsj" v-if="!this.ztcrList.length">暂无数据</div>
+                            <div class="list" v-for="(item,index) in ztcrList"
+                                @click="goToLink('ztcrdetail.html?ztid=' + item.id)" v-else>
                                 <div class="bg">
                                     <img :src="item.logo" alt="">
                                     <div class="number">{{item.space}}</div>
@@ -134,8 +148,10 @@
                                 <div class="left">地块编号</div>
                                 <div class="right">占地面积（亩）</div>
                             </div>
-                            <div class="content">
-                                <div class="list" v-for="(item,index) in tdcrList" @click="goToLink('tdcr.html?tdid=' + item.id)">
+                            <div class="zwsj" v-if="!this.tdcrList.length">暂无数据</div>
+                            <div class="content" v-else>
+                                <div class="list" v-for="(item,index) in tdcrList"
+                                    @click="goToLink('tdcr.html?tdid=' + item.id)">
                                     <div class="left">{{item.landName}}</div>
                                     <div class="right">{{item.landArea}}</div>
                                 </div>
@@ -150,7 +166,8 @@
                             <span>特色服务</span>
                         </div>
                         <div class="tsfw">
-                            <div class="list" v-for="(item,index) in tsfwList" @click="goToLink(item.link)">
+                            <div class="zwsj" v-if="!this.tsfwList.length">暂无数据</div>
+                            <div class="list" v-for="(item,index) in tsfwList" @click="goToLink(item.link)" v-else>
                                 <img :src="item.logo" alt="">
                                 <span>{{ item.title }}</span>
                             </div>
@@ -162,7 +179,8 @@
                             <span>服务事项清单</span>
                         </div>
                         <div class="fwsxqd">
-                            <div v-for="(item,index) in fwsxqdList" class="list">{{item.title}}</div>
+                            <div class="zwsj" v-if="!this.fwsxqdList.length">暂无数据</div>
+                            <div v-for="(item,index) in fwsxqdList" class="list" v-else>{{item.title}}</div>
                         </div>
                     </div>
                 </div>
@@ -228,7 +246,7 @@
                 map.enableScrollWheelZoom();// 启用滚轮缩放
                 map.enableDragging(); // 启用拖拽功能
                 // 设定中心点和地图级别
-                map.centerAndZoom(new BMap.Point(106.651444,29.48682), 15);
+                map.centerAndZoom(new BMap.Point(106.651444, 29.48682), 15);
                 if (!points) return;
                 let pointList = points.split('@');
                 let result = [];
@@ -237,7 +255,7 @@
                     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});
+                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
             },
@@ -281,7 +299,7 @@
                     success: function (data) {
                         let dataList = data.list;
                         dataList.forEach(function (d) {
-                           d.logo = d.imgUrl ? d.imgUrl.split(",")[0] : '';
+                            d.logo = d.imgUrl ? d.imgUrl.split(",")[0] : '';
                         });
                         that.ztcrList = dataList;
                     }
@@ -326,4 +344,5 @@
         }
     });
 </script>
+
 </html>

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

@@ -56,7 +56,7 @@
             cursor: pointer;
             padding: 0 18px;
             width: auto;
-            height: 31px;
+            height: 30px;
             line-height: 30px;
             white-space: nowrap;
         }
@@ -69,9 +69,16 @@
             cursor: pointer;
         }
 
-        .contentleft .content {
+        .contentleft>.content {
             width: 100%;
             margin: auto;
+            height: 1000px;
+            overflow-y: scroll;
+        }
+
+        .contentleft>.content::-webkit-scrollbar {
+            width: 0px;
+            height: 0px;
         }
 
         .contentleft .content ul {
@@ -274,6 +281,18 @@
                         lxdh: "郑亭婷 13512366879",
                         tjzs: "8.5",
                         kzsmj: "12000㎡"
+                    },
+                    {
+                        index: "03",
+                        imgsrc: "images/znxz0.png",
+                        ztmc: "重庆5G产业园二期（智谷公司持有）",
+                        kyqk: "可用",
+                        cybk: "软信服务业、制造业等",
+                        ssyq: "茶园工业园",
+                        lxdz: "通江大道223号",
+                        lxdh: "郑亭婷 13512366879",
+                        tjzs: "8.5",
+                        kzsmj: "12000㎡"
                     }
                 ],
             }