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

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

@@ -204,11 +204,11 @@ html {
 }
 
 .mxqy>ul {
-    height: auto;
+    height: 100%;
     display: flex;
     flex-wrap: wrap;
     list-style-type: none;
-    align-content: space-around;
+    /* align-content: space-around; */
     position: absolute;
     width: 100%;
     overflow-y: scroll;
@@ -222,6 +222,7 @@ html {
 .mxqy>ul li {
     cursor: pointer;
     margin-left: 5px;
+    margin-top: 5px;
 }
 
 .mxqy ul img {

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

@@ -312,7 +312,7 @@
         text-shadow: 3px 1px 2px rgb(40 149 255 / 80%);">政务公开专区</div>
                 <div class="namebtnl" style="right: 189px;top: 59px;background-color: transparent;background: #A7C4E0;
         text-shadow: 3px 1px 2px rgb(40 149 255 / 80%);">自助服务区</div>
-                <div class="namebtn" style="right: 67px;top: 123px;" data-popupType="2" data-id="3">工程建设领域办理区</div>
+                <div class="namebtn" style="right: 67px;top: 123px;" data-popupType="2" data-id="8">工程建设领域办理区</div>
                 <div class="namebtn" style="right: 85px;top: 0;">不动产登记办理区</div>
             </div>
             <div style="font-size: 26px;color: #004A93;">2号楼三楼婚姻登记处社保卡办理</div>
@@ -348,7 +348,7 @@
                 activeNametwo: 'rzbm',
                 popupshow: false,
                 btnName: '',
-                currentFloor: 2,
+                currentFloor: 1,
                 popupType: "other",
                 currentPage: 1,
                 total: 0,
@@ -415,6 +415,7 @@
             },
             floorChange(id) {
                 this.currentFloor = id;
+                this.popupType = 'other'
                 this.popupshow = false;
                 this.unitBtnClick();
             },

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

@@ -375,7 +375,7 @@
                     contentType: 'application/json',
                     data: JSON.stringify({
                         "currentPage": 1,
-                        "pageSize": that.pageSize,
+                        "pageSize": 1000,
                         "parkId": id
                     }),
                     async: false,

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

@@ -78,7 +78,7 @@
         }
 
         .scrollContent {
-            animation: scroll 5s infinite;
+            animation: scroll 10s infinite;
         }
 
         @keyframes scroll {
@@ -164,7 +164,7 @@
                         </div>
                         <div class="mxqy" id="scrollContainer">
                             <div class="zwsj" v-if="!this.mxqyList.length">暂无数据</div>
-                            <ul id="auto-scroll-div" class="scrollContent" v-else>
+                            <ul id="auto-scroll-div" :class="{scrollContent:this.mxqyList.length>12}" v-else>
                                 <li v-for="(item,index) in mxqyList">
                                     <img :src="item.logo" alt="">
                                 </li>
@@ -266,7 +266,7 @@
                             </div> -->
                             <div v-for="(item,index) in fwsxqdList" class="list" v-else>
                                 <div v-if="index==0" style="background: #DEEDFF;
-border: 1px solid #4B98F6;color: #4B98F6;">
+border: 1px solid #4B98F6;color: #4B98F6;" @click="goToLink('tsfw.html')">
                                     <div v-if="item.title.length == 6"
                                         style="display: flex;align-items: center;justify-content: center;flex-direction: column;white-space: nowrap;">
                                         <span>{{item.title.slice(0,4)}}</span><span>{{item.title.slice(4,6)}}</span>
@@ -274,7 +274,7 @@ border: 1px solid #4B98F6;color: #4B98F6;">
                                     <div v-else>{{item.title}}</div>
                                 </div>
                                 <div v-if="index==1" style="background: #CEEBE8;
-border: 1px solid #62B9AF;color: #62B9AF;">
+border: 1px solid #62B9AF;color: #62B9AF;" @click="goToLink('tsfw.html')">
                                     <div v-if="item.title.length == 6"
                                         style="display: flex;align-items: center;justify-content: center;flex-direction: column;white-space: nowrap;">
                                         <span>{{item.title.slice(0,4)}}</span><span>{{item.title.slice(4,6)}}</span>
@@ -282,7 +282,7 @@ border: 1px solid #62B9AF;color: #62B9AF;">
                                     <div v-else>{{item.title}}</div>
                                 </div>
                                 <div v-if="index==2" style="background: #F7EBE0;
-border: 1px solid #EFA34E;color: #EFA34E;">
+border: 1px solid #EFA34E;color: #EFA34E;" @click="goToLink('tsfw.html')">
                                     <div v-if="item.title.length == 6"
                                         style="display: flex;align-items: center;justify-content: center;flex-direction: column;white-space: nowrap;">
                                         <span>{{item.title.slice(0,4)}}</span><span>{{item.title.slice(4,6)}}</span>
@@ -298,7 +298,7 @@ border: 1px solid #EFA34E;color: #EFA34E;">
                                     <div v-else>{{item.title}}</div>
                                 </div>
                                 <div v-if="index==4" style="background: #F7EBE0;
-border: 1px solid #EFA34E;color: #EFA34E;">
+border: 1px solid #EFA34E;color: #EFA34E;" @click="goToLink('tsfw.html')">
                                     <div v-if="item.title.length == 6"
                                         style="display: flex;align-items: center;justify-content: center;flex-direction: column;white-space: nowrap;">
                                         <span>{{item.title.slice(0,4)}}</span><span>{{item.title.slice(4,6)}}</span>
@@ -471,7 +471,6 @@ border: 1px solid #EFA34E;color: #EFA34E;"><span>企业人才</span><span>服务
                         });
                         // 明星企业
                         that.mxqyList = data.filter(item => item.moduleType === "3");
-                        console.log(that.mxqyList)
                         // 特色服务
                         that.fwsxqdList = data.filter(item => item.moduleType === "4");
                         // 政策文件

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

@@ -347,7 +347,9 @@
                         if (!data) return;
                         that.tdcrDetail = data;
                         that.swiperList = data.imgUrl ? data.imgUrl.split(",") : [];
-                        console.log(that.swiperList)
+                        if (!that.swiperList.length) {
+                            that.swiperList.push('images/ztcrlistno.png')
+                        }
                         that.imgUrl = that.swiperList[0];
                         let points = data.parkData.addr;
                         that.loadMap(points, data.point);

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

@@ -123,6 +123,8 @@
             padding: 20px 30px;
             box-sizing: border-box;
             margin-left: 5px;
+            display: flex;
+            align-items: center;
         }
 
         .tsfw .left .title p {
@@ -170,7 +172,9 @@
             <div class="left">
                 <div class="list" v-for="(item, index)  in leftList" :key="index">
                     <div class="title">
-                        <img :src="'images/bg-tsfw'+(index+1)+'.png'" alt="" style="width: 100%;height: 100%;">
+                        <img :src="'images/bg-tsfw'+(index+1)+'.png'" alt="" style="width: 100%;height: 100%;"
+                            v-if="index<6">
+                        <img src="images/bg-tsfw6.png" alt="" style="width: 100%;height: 100%;" v-else>
                         <p>{{item.parkForm}}</p>
                     </div>
                     <div class="content">
@@ -213,6 +217,7 @@
         data: function () {
             return {
                 reqPtah: 'http://8.137.113.116:8082',
+                // reqPtah: 'http://172.16.99.105:8082',
                 leftList: [],
                 person: '',
                 telphone: '',
@@ -223,15 +228,15 @@
             getParkData(id) {
                 let that = this;
                 $.ajax({
-                    url: that.reqPtah + "/specialService/listAll/" + id,
+                    url: that.reqPtah + "/specialService/list/" + id,
                     type: "get",
                     dataType: "json",
                     success: function (data) {
-                        var parkData = data.data.parkData;
+                        var parkData = data.data[0];
                         that.person = parkData.contacts;
                         that.telphone = parkData.contactsPhone;
                         that.address = parkData.contactsAddr;
-                        let value = data.data.specialServicelist;
+                        let value = data.data;
                         let newList = []
                         value.forEach(item => {
                             let status = newList.find(el => el.parkForm === item.parkForm) // 判断第一层级，用name属性来判断

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

@@ -324,6 +324,9 @@
                         that.ztcrDetail = mdata;
 
                         that.swiperList = mdata.imgUrl ? mdata.imgUrl.split(",") : [];
+                        if (!that.swiperList.length) {
+                            that.swiperList.push('images/ztcrlistno.png')
+                        }
                         that.imgUrl = that.swiperList[0];
                         let points = mdata.parkData.addr;
                         that.loadMap(points, mdata.point);