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

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

@@ -1,4 +1,3 @@
-
 ul {
     list-style-type: none;
 }
@@ -7,6 +6,10 @@ li {
     list-style: none;
 }
 
+body {
+    min-width: 1500px;
+}
+
 @font-face {
     font-family: 'DOUYU';
     src: url('../fonts/DOUYUFONT-2.OTF');
@@ -23,12 +26,34 @@ li {
     color: #186FF0;
     height: 66px;
     border-bottom: 1px solid #B7C7DC;
+    cursor: pointer;
 }
 
 .toplogo img {
     margin: 0 20px;
 }
 
+
+.backbutton {
+    width: 117px;
+    height: 42px;
+    background: #DEEDFF;
+    border-radius: 10px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #2474F1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.backbutton img {
+    margin-right: 0.625rem;
+}
+
 .title {
     display: flex;
     align-items: center;
@@ -60,6 +85,7 @@ li {
     border: 1px solid #A3C4ED;
     box-sizing: border-box;
 }
+
 .contentleft>.buttontz {
     width: 100%;
     height: 115px;
@@ -81,11 +107,13 @@ li {
     color: #333333;
     margin: 20px 0;
 }
+
 .contentleft>.gk {
     background: #FFFFFF;
     padding: 10px;
     margin-top: 10px;
 }
+
 .text {
     font-size: 20px;
     color: #333333;

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

@@ -2,11 +2,14 @@
     padding: 0;
     margin: 0;
 }
+
 body {
     margin: 0;
     padding: 0;
+    min-width: 1500px;
 }
 
+
 .toplogo {
     display: flex;
     align-items: center;
@@ -16,18 +19,41 @@ body {
     color: #186FF0;
     height: 66px;
     border-bottom: 1px solid #B7C7DC;
+    cursor: pointer;
 }
 
 .toplogo img {
     margin: 0 20px;
 }
 
+
+.backbutton {
+    width: 117px;
+    height: 42px;
+    background: #DEEDFF;
+    border-radius: 10px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #2474F1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.backbutton img {
+    margin-right: 0.625rem;
+}
+
 .title {
     display: flex;
     align-items: center;
     margin-top: 10px;
 }
-.title .more{
+
+.title .more {
     color: #666;
     cursor: pointer;
 }
@@ -91,8 +117,16 @@ body {
     padding-left: 20px;
     box-sizing: border-box;
     justify-content: center;
+    cursor: pointer;
 }
-.qwys ul{
+
+.qwys .list:hover {
+    filter: brightness(120%);
+    background-color: #afb2b6;
+    /* color: #fff; */
+}
+
+.qwys ul {
     padding-left: 30px;
     margin-top: 10px;
 }
@@ -111,6 +145,7 @@ body {
 .qwys .list .name img {
     margin-right: 10px;
 }
+
 .contentleft .left {
     width: 58.5%;
 }
@@ -118,6 +153,7 @@ body {
 .contentleft .right {
     width: 39%;
 }
+
 .yqhd {
     font-size: 16px;
     color: #333333;
@@ -127,6 +163,7 @@ body {
     box-sizing: border-box;
     overflow-y: scroll;
 }
+
 .yqhd::-webkit-scrollbar {
     width: 0px;
     height: 0px;
@@ -138,7 +175,8 @@ body {
     flex-direction: column;
     margin-left: 30px;
 }
-.yqhd ul li{
+
+.yqhd ul li {
     cursor: pointer;
     margin-bottom: 20px;
 }
@@ -156,7 +194,8 @@ body {
     justify-content: space-between;
     align-content: space-around;
 }
-.mxqy>ul li{
+
+.mxqy>ul li {
     cursor: pointer;
 }
 
@@ -164,6 +203,7 @@ body {
     width: 86px;
     height: 49px;
 }
+
 .zcwj {
     font-size: 16px;
     color: #333333;
@@ -173,6 +213,7 @@ body {
     box-sizing: border-box;
     overflow-y: scroll;
 }
+
 .zcwj::-webkit-scrollbar {
     width: 0px;
     height: 0px;
@@ -184,9 +225,11 @@ body {
     flex-direction: column;
     margin-left: 30px;
 }
-.zcwj li{
+
+.zcwj li {
     margin-bottom: 10px;
 }
+
 .zcwj li>div {
     display: -webkit-box;
     line-height: 20px;
@@ -206,7 +249,8 @@ body {
     display: flex;
     align-items: center;
 }
-.ztcr .list{
+
+.ztcr .list {
     cursor: pointer;
     margin-left: 3px;
 }
@@ -255,10 +299,12 @@ body {
     padding-bottom: 10px;
     box-sizing: border-box;
 }
-.tdcr .content{
+
+.tdcr .content {
     height: calc(100% - 52px);
     overflow-y: scroll;
 }
+
 .tdcr .content::-webkit-scrollbar {
     width: 0px;
     height: 0px;
@@ -325,4 +371,8 @@ body {
     font-size: 20px;
     color: #4B98F6;
     cursor: pointer;
+}
+
+.fwsxqd .ather {
+    padding: 0 25px;
 }

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

@@ -0,0 +1,334 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <!-- 引入 Vue -->
+    <script src="https://unpkg.com/vue@2.6.14/dist/vue.min.js"></script>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <!-- 引入组件库 -->
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <!-- jquery-->
+    <script src="js/jquery-3.5.1.min.js"></script>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+
+        html,
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: Microsoft YaHei;
+            height: 100%;
+            background: #EDF5FF;
+        }
+
+        @font-face {
+            font-family: 'DOUYU';
+            src: url('../fonts/DOUYUFONT-2.OTF');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .dqfw>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
+
+        .toplogo {
+            display: flex;
+            align-items: center;
+            font-family: DOUYU;
+            font-weight: normal;
+            font-size: 30px;
+            color: #186FF0;
+            height: 66px;
+            cursor: pointer;
+        }
+
+        .toplogo img {
+            margin: 0 20px;
+        }
+
+        .backbutton {
+            width: 117px;
+            height: 42px;
+            background: #DEEDFF;
+            border-radius: 10px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #2474F1;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+        .backbutton img {
+            margin-right: 10px;
+        }
+
+        .container {
+            display: flex;
+            justify-content: space-between;
+            min-width: 1300px;
+        }
+
+        .container>.left {
+            width: 36%;
+            background: #fff;
+        }
+
+        .container>.left .title {
+            padding-left: 30px;
+            box-sizing: border-box;
+            height: 53px;
+            line-height: 53px;
+            background: #DEEDFF;
+            font-size: 20px;
+            color: #4B98F6;
+        }
+
+        .container>.left li {
+            cursor: pointer;
+            margin: 10px 0;
+        }
+
+        .container>.left li.active {
+            color: #4B98F6;
+        }
+
+        .container>.right {
+            background: #fff;
+            width: 63%;
+            min-width: 790px;
+        }
+
+        .dqfw .line {
+            width: 4px;
+            height: 20px;
+            background: #4B98F6;
+            margin: 0 10px;
+        }
+
+        .container>.right .title {
+            display: flex;
+            align-items: center;
+            color: #4B98F6;
+            padding: 10px;
+            box-sizing: border-box;
+            border-bottom: 1px solid #4B98F6;
+        }
+
+        .container>.right .title span {
+            word-break: break-all;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .container>.right .content {
+            border: 1px solid #4B98F6;
+            margin: 10px;
+        }
+
+        .content .person {
+            width: 100%;
+            height: 161px;
+            display: flex;
+        }
+
+        .content .person .grzl {
+            width: 36%;
+            display: flex;
+            background: #4B98F6;
+            color: #FFFFFF;
+            padding-top: 10px;
+            box-sizing: border-box;
+        }
+
+        .content .person .grzl img {
+            width: 51px;
+            height: 51px;
+        }
+
+        .content .person .grzl p:first-child {
+            font-size: 26px;
+            color: #FFFFFF;
+            line-height: 48px;
+            text-shadow: 3px 5px 7px rgba(44, 119, 210, 0.43);
+            background: linear-gradient(0deg, rgba(172, 204, 243, 0.98) 0%, rgba(255, 255, 255, 0.98) 99.12109375%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+        }
+
+        .content .person .sevre {
+            color: #4B98F6;
+            padding: 40px;
+            background: #DEEDFF;
+            box-sizing: border-box;
+        }
+
+        .content>.bottom {
+            padding: 35px;
+            box-sizing: border-box;
+        }
+
+        .content>.bottom .name {
+            height: 51px;
+            line-height: 51px;
+            width: 263px;
+            background: #4BB664;
+            font-size: 20px;
+            color: #FFFFFF;
+            padding: 0 30px;
+            margin-bottom: 30px;
+            word-break: break-all;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="dqfw" id="dqfw">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>党群服务</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div class="container">
+            <div class="left">
+                <div class="list" v-for="(item, index)  in leftList" :key="index">
+                    <div class="title">{{item.name}}</div>
+                    <ul style="padding-left: 40px;">
+                        <li :class="{ active: currentTab == tabl.id }" v-for="(tabl, indexl)  in item.content"
+                            :key="indexl" @click="menuChange(tabl.id)">
+                            {{tabl.title}}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="right">
+                <div class="title">
+                    <div class="line"></div>
+                    <span>{{rightdata.title}}</span>
+                </div>
+                <div class="content">
+                    <div class="person">
+                        <div class="grzl">
+                            <img src="images/logo-person.png" alt="">
+                            <div>
+                                <p>联系人</p>
+                                <p><span>姓名：</span><span>{{rightdata.person.name}}</span></p>
+                                <p><span>联系电话：</span><span>{{rightdata.person.tel}}</span></p>
+                                <p><span>地址：</span><span>{{rightdata.person.addr}}</span></p>
+                            </div>
+                        </div>
+                        <div class="sevre">{{rightdata.serve}}</div>
+                    </div>
+                    <div class="bottom">
+                        <div class="name" :title="rightdata.title">{{rightdata.title}}</div>
+                        <div style="color: #333333;line-height: 48px;">{{rightdata.content}}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</body>
+<script>
+    // 初始化Vue实例
+    new Vue({
+        el: '#dqfw',
+        data: function () {
+            return {
+                reqPtah: 'http://172.16.99.105:8082',
+                currentTab: '',
+                leftList: [
+                    {
+                        id: 1,
+                        name: "党建服务事项",
+                        content: [
+                            {
+                                id: 1,
+                                title: "经开区新建非公党组织流程图"
+                            },
+                            {
+                                id: 2,
+                                title: "发展党员工作流程图"
+                            }
+                        ]
+                    },
+                    {
+                        id: 2,
+                        name: "工会服务事项",
+                        content: [
+                            {
+                                id: 3,
+                                title: "建会工作"
+                            },
+                            {
+                                id: 4,
+                                title: "建档困难职工申报工作"
+                            },
+                            {
+                                id: 5,
+                                title: "荣誉申报工作"
+                            }
+                        ]
+                    },
+                    {
+                        id: 3,
+                        name: "统战服务事项",
+                        content: [{
+                            id: 6,
+                            title: "申请加入经开区商会、南岸区知联会经开区分会、南岸区新专联经开区分会的条件和流程"
+                        }]
+                    }
+                ],
+                rightdata: {
+                    title: "申请加入经开区商会、南岸区知联会经开区分会、南岸区新专联经开区分会的条件和流程",
+                    person: {
+                        name: "韦阳",
+                        tel: "62900936、18983356510",
+                        addr: "重庆经开区管委会709办公室"
+                    },
+                    serve: "统筹经开区工会工作，涉及建会、建档困难职工申报、荣誉申报等工作。",
+                    content: `（1）了解企业基本情况，其中包括：企业名称、企业地址（注册地和实际经营地）职工人数等相关信息，可通过电话联系或上门走访的方式进行了解。
+（2）企业满足建会条件后，将成立工会的模版（成立工会的请示、选举结果的报告）发给企业，由企业将相关信息填报后报经开区总工会，经开区总工会收到后做好收文登记，并为企业拟定相关批复。
+（3）企业拿到批复后，到南岸区行政中心A区1号楼103办公室（联系人：王粒亚，联系电话：62989357）开具刻章介绍信。
+（4）刻章介绍信拿到后，可推送刻章人员微信，联系刻章人员刻章（南岸区公安分局合法公章指定刻制单位地址：重庆市南岸区茶园新区汇成路1号附1号2—9淦浩印章（重庆农村商业银行楼上），联系人：王雪鹏，联系电话：13983373991）。
+（5）刻章完成后，到南岸区职工服务中心办理工会法人资格证（联系人：周恬，联系电话：62757621）。
+（6）工会法人资格证办理完成后，到银行开设工会的独立账户。`
+                }
+            };
+        },
+        methods: {
+            menuChange(id) {
+                this.currentTab = id;
+            },
+        },
+        mounted() {
+
+        }
+    });
+</script>
+
+</html>

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

@@ -256,10 +256,8 @@
         <div class="content">
             <div class="title">{{currentTitle}}</div>
             <img src="images/cygyyline.png" alt="" class="line">
-            <div class="text">重庆市南岸区人民政府办公室 ​重庆经济技术开发区管理委员会办公室关于重庆市南岸区人民政府办公室
-                ​重庆经济技术开发区管理委员会办公室关于印发《南岸区重庆经开区优化营商环境专项行动方案...印发《南岸区重庆经开区优化营商环境专项行动方案...重庆市南岸区人民政府办公室
-                ​重庆经济技术开发区管理委员会办公室关于重庆市南岸区人民政府办公室 ​... <span style="color: #E5C999;cursor: pointer;" @click="cheakmore">
-                    详情>></span></div>
+            <div class="text">{{parkDesc}}<span v-if="parkDesc && parkDesc.length > 200">...</span>
+                <span v-if="parkDesc && parkDesc.length > 200" style="color: #E5C999;cursor: pointer;" @click="cheakmore">详情>></span></div>
             <div class="swiper mySwiper">
                 <div class="swiper-wrapper">
                     <div class="swiper-slide list" v-for="(item,index) in swiperList"
@@ -284,10 +282,11 @@
         el: '#indexcygyy',
         data: function () {
             return {
-                reqPtah: 'http://172.16.99.105:8082',
+                reqPtah: 'http://172.16.99.102:8082',
                 currentTab: -1,
                 titleList: [],
                 currentTitle: '',
+                parkDesc: '',
                 swiperList: [
                 ]
             };
@@ -299,6 +298,7 @@
             menuChange(id) {
                 this.getDetailData(id);
                 this.currentTab = id;
+                this.getSellBuild(id);
             },
             back() {
                 window.location.href = "indexsyyg.html"
@@ -308,7 +308,7 @@
             },
             goToLink(url) {
                 if (url) {
-                    window.open(url);
+                    window.location.href = url;
                 }
             },
             getSellBuild(id) {
@@ -355,6 +355,7 @@
                     dataType: "json",
                     success: function (data) {
                         that.currentTitle = data.title;
+                        that.parkDesc = data.desc;
                     }
                 })
             }

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

@@ -146,8 +146,7 @@
         #titleTabs .active .tab-contents {
             display: flex;
             flex-direction: column;
-            justify-content: space-evenly;
-            height: 22vh;
+            height: 24vh;
             background: rgb(116 175 244 / 40%);
         }
 
@@ -184,13 +183,14 @@
             height: 2.5rem;
             padding-left: 1.25rem;
             box-sizing: border-box;
+            margin-top: 0.625rem;
         }
 
         .tab-contents li img {
             margin-right: 0.9375rem;
         }
 
-        .tab-contents li.more {
+        .tab-contents .more {
             padding-left: 2.6875rem;
             font-size: 0.875rem;
             color: #FFFFFF;
@@ -255,15 +255,17 @@
                     <div class="name" @click="tsmore(tab.id)">
                         {{tab.title}}
                     </div>
-                    <ul class="tab-contents">
-                        <li v-for="(tabl, indexl)  in tab.subtitleList" :key="indexl">
-                            <img src="images/listlogo.png" alt="" />
-                            <div class="name">{{tabl}}</div>
-                        </li>
-                        <li class="more" @click="tsmore(tab.id)" v-if="tab.subtitleList.length">
+                    <div class="tab-contents">
+                        <ul class="">
+                            <li v-for="(tabl, indexl)  in tab.subtitleList" :key="indexl">
+                                <img src="images/listlogo.png" alt="" />
+                                <div class="name">{{tabl}}</div>
+                            </li>
+                        </ul>
+                        <div class="more" @click="tsmore(tab.id)" v-if="tab.subtitleList.length">
                             探索更多>>
-                        </li>
-                    </ul>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -301,7 +303,7 @@
                     success: function (data) {
 
                         data.forEach(function (item) {
-                            item.subtitleList = item.subtitle ? item.subtitle.split(",") : [];
+                            item.subtitleList = item.subtitle ? item.subtitle.split(",").slice(0, 3) : [];
                         })
                         that.titleList = data;
                         console.log(data);

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

@@ -400,6 +400,10 @@
         render();
         // 创建控件对象
         let controls = new THREE.OrbitControls(camera, renderer.domElement);
+        controls.enableZoom = false
+        // controls.enableRotate = false
+        controls.maxPolarAngle = Math.PI / 2
+        controls.minPolarAngle = 0
         // 监听鼠标、键盘事件
         controls.addEventListener('change', render);
         // 辅助线

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

@@ -0,0 +1,358 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+
+        html,
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: Microsoft YaHei;
+            height: 100%;
+            background: #EDF5FF;
+        }
+
+        @font-face {
+            font-family: 'DOUYU';
+            src: url('../fonts/DOUYUFONT-2.OTF');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .qysmzq>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
+
+        .toplogo {
+            display: flex;
+            align-items: center;
+            font-family: DOUYU;
+            font-weight: normal;
+            font-size: 30px;
+            color: #186FF0;
+            height: 66px;
+            cursor: pointer;
+        }
+
+        .toplogo img {
+            margin: 0 20px;
+        }
+
+        .backbutton {
+            width: 117px;
+            height: 42px;
+            background: #DEEDFF;
+            border-radius: 10px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #2474F1;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+        .backbutton img {
+            margin-right: 0.625rem;
+        }
+
+        .qysmzq {
+            height: 100%;
+            min-height: 930px;
+            max-height: 1080px;
+        }
+
+        .container {
+            height: 100%;
+            padding: 10px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+        }
+
+
+        .conlist {
+            width: 49.5%;
+            min-width: 727px;
+            height: 49%;
+            min-height: 380px;
+            padding: 20px;
+            box-sizing: border-box;
+            background: #FFFFFF;
+            margin-bottom: 20px;
+        }
+
+        .conlist .list {
+            display: flex;
+            align-items: center;
+            font-size: 20px;
+            color: #999999;
+        }
+
+        .conlist .top {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+
+        .conlist .list .title span {
+            white-space: nowrap;
+            word-break: break-all;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        .conlist .top .title span:first-child {
+            font-size: 30px;
+            color: #333333;
+            font-weight: bold;
+        }
+
+        .conlist .top img {
+            margin-right: 15px;
+        }
+
+        .conlist .top .more {
+            color: #186FF0;
+            cursor: pointer;
+        }
+
+        .conlist .list .title span:first-child {
+            margin-bottom: 10px;
+        }
+
+        .conlist .list .title {
+            display: flex;
+            flex-direction: column;
+        }
+
+        .conlist .content {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            height: calc(100% - 76px);
+        }
+
+        .conlist .content img {
+            margin: 15px;
+        }
+
+        .conlist .content .list {
+            width: 48%;
+            padding: 10px;
+            border: 1px solid #DADADA;
+            box-sizing: border-box;
+            margin-top: 20px;
+        }
+
+        .conlist .content .title {
+            width: 70%;
+        }
+
+        .conlist .content .title span:first-child {
+            font-size: 26px;
+            color: #333333;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="qysmzq">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>企业生命周期</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div class="container">
+            <div class="conlist">
+                <div class="top">
+                    <div class="list">
+                        <img src="images/logo-cyfw.png" alt="">
+                        <div class="title">
+                            <span>创业服务</span>
+                            <span>包括企业选址服务</span>
+                        </div>
+                    </div>
+                    <div class="more">更多>></div>
+                </div>
+                <div class="content">
+                    <div class="list">
+                        <img src="images/cyfw1.png" alt="">
+                        <div class="title">
+                            <span>不动产信息检索</span>
+                            <span>提供企业用地、厂房信息查询</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/cyfw2.png" alt="">
+                        <div class="title">
+                            <span>出具不动产查询结果</span>
+                            <span>提供出具不动产信息的查询结果</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/cyfw3.png" alt="">
+                        <div class="title">
+                            <span>南岸区产业地图</span>
+                            <span>提供全区的产业地图并分区说明</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/cyfw4.png" alt="">
+                        <div class="title">
+                            <span>南岸区投资优势</span>
+                            <span>投资南岸若干优势</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="conlist">
+                <div class="top">
+                    <div class="list">
+                        <img src="images/logo-kbqy.png" alt="">
+                        <div class="title">
+                            <span>开办企业</span>
+                            <span>包括开办企业、初创服务、住所（经营场所）场地服务</span>
+                        </div>
+                    </div>
+                    <div class="more">更多>></div>
+                </div>
+                <div class="content">
+                    <div class="list">
+                        <img src="images/kbqy1.png" alt="">
+                        <div class="title">
+                            <span>包括企业选址服务</span>
+                            <span>提供一表申报完成企业注册领...</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/kbqy2.png" alt="">
+                        <div class="title">
+                            <span>企业注册</span>
+                            <span>提供个体工商户、内资企业、...</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/kbqy3.png" alt="">
+                        <div class="title">
+                            <span>公司印章服务</span>
+                            <span>提供企业、非法人组织的印章备...</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/kbqy4.png" alt="">
+                        <div class="title">
+                            <span>企业银行账户服务</span>
+                            <span>提供银税三方（委托）划缴协议</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="conlist">
+                <div class="top">
+                    <div class="list">
+                        <img src="images/logo-qyjy.png" alt="">
+                        <div class="title">
+                            <span>企业经营</span>
+                            <span>包括人力资源服务、财税服务、工商服务、贸易管理、企业信用...</span>
+                        </div>
+                    </div>
+                    <div class="more">更多>></div>
+                </div>
+                <div class="content">
+                    <div class="list">
+                        <img src="images/qyjy1.png" alt="">
+                        <div class="title">
+                            <span>集体合同审查备案</span>
+                            <span>为企业职工质检进行集体协商，</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyjy2.png" alt="">
+                        <div class="title">
+                            <span>社保服务</span>
+                            <span>为企业职工提供参保信息变更</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyjy3.png" alt="">
+                        <div class="title">
+                            <span>住房补贴</span>
+                            <span>对法人金融机构的高管，给予...</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyjy4.png" alt="">
+                        <div class="title">
+                            <span>办税日历</span>
+                            <span>可查看2024年国家税务总局广...</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="conlist">
+                <div class="top">
+                    <div class="list">
+                        <img src="images/logo-qyzx.png" alt="">
+                        <div class="title">
+                            <span>企业注销</span>
+                            <span>包括人力资源服务、财税服务、工商服务、贸易管理、企业信用...</span>
+                        </div>
+                    </div>
+                    <div class="more">更多>></div>
+                </div>
+                <div class="content">
+                    <div class="list">
+                        <img src="images/qyzx1.png" alt="">
+                        <div class="title">
+                            <span>企业注销一网通</span>
+                            <span>为企业提供注销服务</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyzx2.png" alt="">
+                        <div class="title">
+                            <span>企业注销登记</span>
+                            <span>为内外资企业、个体户、非公...</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyzx3.png" alt="">
+                        <div class="title">
+                            <span>企业裁员备案</span>
+                            <span>提供企业经营性裁员报告备案</span>
+                        </div>
+                    </div>
+                    <div class="list">
+                        <img src="images/qyzx4.png" alt="">
+                        <div class="title">
+                            <span>【视频解读】办理破产</span>
+                            <span>13条举措解读破产企业如何办</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>

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

@@ -29,14 +29,39 @@
             align-items: center;
             justify-content: center;
         }
+
+        .cyfb {
+            display: -webkit-box;
+            line-height: 20px;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+            cursor: pointer;
+        }
+
+        #ggyq>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
     </style>
 </head>
 
 <body>
     <div id="ggyq">
-        <div class="toplogo">
-            <img src="images/gyylogo.png" alt="">
-            <span>{{this.jbqk.title}}</span>
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>{{this.jbqk.title}}</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
         </div>
         <div style="display: flex;">
             <div class="contentleft">
@@ -47,15 +72,15 @@
                 <div class="jbqk">
                     <div class="list" style="background-image: url(images/jbqk1.png);">
                         <p>总面积</p>
-                        <p><span>{{this.jbqk.totalArea?this.jbqk.totalArea:'- '}}</span><span>平方公里</span></p>
+                        <p><span id="totalSpace">-</span><span>平方公里</span></p>
                     </div>
                     <div class="list" style="background-image: url(images/jbqk2.png);">
                         <p>建成面积 </p>
-                        <p><span>{{this.jbqk.buildArea?this.jbqk.buildArea:'- '}}</span><span>平方公里</span></p>
+                        <p><span id="buildSpace">-</span><span>平方公里</span></p>
                     </div>
                     <div class="list" style="background-image: url(images/jbqk3.png);">
                         <p>产业分布</p>
-                        <span>{{this.jbqk.industry?this.jbqk.industry:'- '}}</span>
+                        <span class="cyfb" :title="jbqk.industry">{{this.jbqk.industry?this.jbqk.industry:'- '}}</span>
                     </div>
                 </div>
                 <div class="title">
@@ -131,7 +156,7 @@
                                 @click="goToLink('ztcrdetail.html?ztid=' + item.id)" v-else>
                                 <div class="bg">
                                     <img :src="item.logo" alt="">
-                                    <div class="number">{{item.space}}</div>
+                                    <div class="number">{{item.space}}&nbsp;㎡</div>
                                 </div>
                                 <div class="title">{{item.carrierName}}</div>
                                 <div class="content">{{item.subtitle}}</div>
@@ -180,7 +205,10 @@
                         </div>
                         <div class="fwsxqd">
                             <div class="zwsj" v-if="!this.fwsxqdList.length">暂无数据</div>
-                            <div v-for="(item,index) in fwsxqdList" class="list" v-else>{{item.title}}</div>
+                            <div :class="{ ather: item.title.length == 6 }" v-for="(item,index) in fwsxqdList"
+                                class="list" @click="goTsfw" v-else>
+                                {{item.title}}
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -219,16 +247,24 @@
             this.getParkActivity(id);
         },
         methods: {
+            goIndex() {
+                window.location.href = "indexsyyg.html"
+            },
             ztcrmore() {
                 const url = new URL(window.location.href);
                 const id = url.searchParams.get('id');
-                window.open("ztcrlist.html?id=" + id);
+                window.location.href = "ztcrlist.html?id=" + id;
             },
             goToLink(url) {
                 if (url) {
-                    window.open(url);
+                    window.location.href = url;
                 }
             },
+            goTsfw() {
+                const url = new URL(window.location.href);
+                const id = url.searchParams.get('id');
+                window.location.href = "tsfw.html?id=" + id;
+            },
             getJBQK(id) {
                 let that = this;
                 $.ajax({
@@ -238,6 +274,13 @@
                     success: function (data) {
                         that.jbqk = data;
                         that.loadMap(data.addr);
+                        const time = 500;
+                        // 总面积
+                        const totalSpaceElement = document.getElementById('totalSpace');
+                        that.animateValue(totalSpaceElement, 0, data.totalArea ? parseFloat(data.totalArea).toFixed(2) : 0, time);
+                        // 建成面积
+                        const buildSpaceElement = document.getElementById('buildSpace');
+                        that.animateValue(buildSpaceElement, 0, data.buildArea ? parseFloat(data.buildArea).toFixed(2) : 0, time);
                     }
                 })
             },
@@ -347,6 +390,22 @@
                         that.yqhdList = dataList;
                     }
                 });
+            },
+            animateValue(obj, start, end, duration) {
+                let startTimestamp = null;
+                const step = (timestamp) => {
+                    if (!startTimestamp) startTimestamp = timestamp;
+                    const progress = Math.min((timestamp - startTimestamp) / duration, 1);
+                    obj.innerHTML = Math.floor(progress * (end - start) + start);
+                    if (progress < 1) {
+                        window.requestAnimationFrame(step);
+                    } else {
+                        obj.innerHTML = end;
+                        obj.classList.remove('animate');
+                    }
+                };
+                obj.classList.add('animate');
+                window.requestAnimationFrame(step);
             }
         }
     });

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

@@ -17,6 +17,14 @@
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </script>
     <style>
+        #tdcr>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
+
         .contentleft {
             width: 50%;
             min-width: 841px;
@@ -54,6 +62,7 @@
         .swiper-slide img {
             width: 100%;
             height: 104px;
+            cursor: pointer;
         }
 
         .swiper-button-next,
@@ -84,74 +93,82 @@
 
 
 <body>
-    <div class="toplogo">
-        <img src="images/gyylogo.png" alt="">
-        <span>土地出让</span>
-    </div>
-    <div style="display: flex;">
-        <div class="contentleft" id="tdcr">
-            <div class="itemname">
-                {{ tdcrDetail.landName }}
+    <div id="tdcr">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>土地出让</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
             </div>
-            <div class="swiperimg">
-                <img :src="imgUrl" alt="" style="width: 75%;height: 394px;">
-                <div class="swiper-button-prev"></div>
-                <div class="swiper mySwiper">
-                    <div class="swiper-wrapper">
-                        <div class="swiper-slide list" v-for="(item,index) in swiperList" @click="imgDetail(item)">
-                            <img :src="item" alt="">
+        </div>
+        <div style="display: flex;">
+            <div class="contentleft">
+                <div class="itemname">
+                    {{ tdcrDetail.landName }}
+                </div>
+                <div class="swiperimg">
+                    <img :src="imgUrl" alt="" style="width: 75%;height: 394px;">
+                    <div class="swiper-button-prev"></div>
+                    <div class="swiper mySwiper">
+                        <div class="swiper-wrapper">
+                            <div class="swiper-slide list" v-for="(item,index) in swiperList" @click="imgDetail(item)">
+                                <img :src="item" alt="">
+                            </div>
                         </div>
                     </div>
+                    <div class="swiper-button-next"></div>
                 </div>
-                <div class="swiper-button-next"></div>
-            </div>
-            <div class="list">
-                <div class="listitm" style="background-color: #4EB2AD;">
-                    <span>占地面积</span>
-                    <span>{{ tdcrDetail.landArea }}</span>
+                <div class="list">
+                    <div class="listitm" style="background-color: #4EB2AD;">
+                        <span>占地面积</span>
+                        <span>{{ tdcrDetail.landArea }}&nbsp;㎡</span>
+                    </div>
+                    <div class="listitm" style="background-color: #4B98F6;">
+                        <span>土地用途</span>
+                        <span>{{ tdcrDetail.landFunction }}</span>
+                    </div>
+                    <div class="listitm" style="background-color: #4BB664;">
+                        <span>基础设施配套</span>
+                        <span>{{ tdcrDetail.basicConfiguration }}</span>
+                    </div>
+                    <div class="listitm" style="background-color: #DFC483;">
+                        <span>可招商面积</span>
+                        <span>{{ tdcrDetail.usableArea }}&nbsp;㎡</span>
+                    </div>
                 </div>
-                <div class="listitm" style="background-color: #4B98F6;">
-                    <span>土地用途</span>
-                    <span>{{ tdcrDetail.landFunction }}</span>
+                <div class="text">
+                    <div style="align-items: flex-start;">
+                        <span>主导产业：</span>
+                        <div class="icon"
+                            v-for="(item,index) in (tdcrDetail.landFunction ? tdcrDetail.landFunction.split('、') : [])">
+                            {{
+                            item }}</div>
+                    </div>
+                    <div><span>详细地址：</span><span>{{ tdcrDetail.addr }}</span></div>
+                    <div><span>联系方式：</span><span>{{ tdcrDetail.contactName }}&nbsp;&nbsp;{{ tdcrDetail.contactPhone
+                            }}</span></div>
                 </div>
-                <div class="listitm" style="background-color: #4BB664;">
-                    <span>基础设施配套</span>
-                    <span>{{ tdcrDetail.basicConfiguration }}</span>
+                <div class="buttontz">我要投资</div>
+                <div class="title">
+                    <img src="images/gyy-gk.png" alt="">
+                    <span>概况</span>
                 </div>
-                <div class="listitm" style="background-color: #DFC483;">
-                    <span>可招商面积</span>
-                    <span>{{ tdcrDetail.usableArea }}</span>
+                <div class="gk">
+                    {{ tdcrDetail.introduce }}
                 </div>
-            </div>
-            <div class="text">
-                <div style="align-items: flex-start;">
-                    <span>主导产业：</span>
-                    <div class="icon"
-                        v-for="(item,index) in (tdcrDetail.landFunction ? tdcrDetail.landFunction.split('、') : [])">{{
-                        item }}</div>
+                <div class="title">
+                    <img src="images/hyy-yscb.png" alt="">
+                    <span>要素成本</span>
+                </div>
+                <div class="tablecon" v-html="tdcrDetail.cost">
                 </div>
-                <div><span>详细地址：</span><span>{{ tdcrDetail.addr }}</span></div>
-                <div><span>联系方式：</span><span>{{ tdcrDetail.contactName }}&nbsp;&nbsp;{{ tdcrDetail.contactPhone
-                        }}</span></div>
-            </div>
-            <div class="buttontz">我要投资</div>
-            <div class="title">
-                <img src="images/gyy-gk.png" alt="">
-                <span>概况</span>
-            </div>
-            <div class="gk">
-                {{ tdcrDetail.introduce }}
-            </div>
-            <div class="title">
-                <img src="images/hyy-yscb.png" alt="">
-                <span>要素成本</span>
-            </div>
-            <div class="tablecon" v-html="tdcrDetail.cost">
             </div>
+            <div class="contentright" id="mapcontainer"></div>
         </div>
-        <div class="contentright" id="mapcontainer"></div>
     </div>
-
 </body>
 <script src="swiper/swiper-bundle.js"></script>
 <script>
@@ -170,7 +187,7 @@
         el: '#tdcr',
         data: function () {
             return {
-                reqPtah: 'http://172.16.99.105:8082',
+                reqPtah: 'http://172.16.99.102:8082',
                 tdcrDetail: {},
                 imgUrl: '',
                 swiperList: []
@@ -182,6 +199,9 @@
             this.getLandDetail(id);
         },
         methods: {
+            backIndex() {
+                window.history.go(-1)
+            },
             imgDetail(imgurl) {
                 if (imgurl == "images/tdcr0.png") {
                     return
@@ -194,6 +214,7 @@
                 map.enableDragging(); // 启用拖拽功能
                 // 设定中心点和地图级别
                 map.centerAndZoom(new BMap.Point(106.651444, 29.48682), 15);
+                map.setMapType(BMAP_SATELLITE_MAP);
                 if (!points) return;
                 let pointList = points.split('@');
                 let result = [];
@@ -203,12 +224,12 @@
                 });
                 // 创建多边形
                 let polygon = new BMap.Polygon(result, {
-                    strokeColor: "blue",
-                    strokeWeight: 2,
-                    strokeOpacity: 0.5,
+                    strokeColor: "#3d9bee",
+                    strokeWeight: 3,
+                    strokeOpacity: 0.9,
                     strokeStyle: "dashed",
                     fillColor: "#C9E1F6",
-                    fillOpacity: 0.9
+                    fillOpacity: 0.4
                 });
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
@@ -224,7 +245,6 @@
                 });
             },
             getLandDetail(id) {
-                console.log(id)
                 let that = this;
                 $.ajax({
                     url: that.reqPtah + "/sellLand/" + id,

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

@@ -0,0 +1,257 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <!-- 引入 Vue -->
+    <script src="https://unpkg.com/vue@2.6.14/dist/vue.min.js"></script>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <!-- 引入组件库 -->
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <!-- jquery-->
+    <script src="js/jquery-3.5.1.min.js"></script>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+
+        html,
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: Microsoft YaHei;
+            height: 100%;
+            background: #EDF5FF;
+        }
+
+        @font-face {
+            font-family: 'DOUYU';
+            src: url('../fonts/DOUYUFONT-2.OTF');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .tsfw>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
+
+        .toplogo {
+            display: flex;
+            align-items: center;
+            font-family: DOUYU;
+            font-weight: normal;
+            font-size: 30px;
+            color: #186FF0;
+            height: 66px;
+            cursor: pointer;
+        }
+
+        .toplogo img {
+            margin: 0 20px;
+        }
+
+        .backbutton {
+            width: 117px;
+            height: 42px;
+            background: #DEEDFF;
+            border-radius: 10px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #2474F1;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+        .backbutton img {
+            margin-right: 10px;
+        }
+
+        .tsfw>.container {
+            display: flex;
+            padding: 10px;
+        }
+
+        .tsfw>.container .left {
+            width: 74.5%;
+        }
+
+        .tsfw>.container .right {
+            width: 25%;
+            background-image: url(images/bg-tsfwr.png);
+            background-size: 100% 100%;
+            margin-top: 10px;
+            padding: 0 20px;
+            box-sizing: border-box;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            min-width: 380px;
+        }
+
+        .tsfw .left .list {
+            display: flex;
+            margin-top: 10px;
+            min-width: 820px;
+        }
+
+        .tsfw .left .title {
+            position: relative;
+            width: 30%;
+        }
+
+        .tsfw .left .content {
+            width: 69.5%;
+            background: #DEEDFF;
+            border: 1px solid #4B98F6;
+            font-size: 20px;
+            color: #4B98F6;
+            line-height: 36px;
+            padding: 20px 30px;
+            box-sizing: border-box;
+            margin-left: 5px;
+        }
+
+        .tsfw .left .title p {
+            white-space: nowrap;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            font-family: Microsoft YaHei;
+            font-weight: bold;
+            font-size: 40px;
+            color: #FFFFFF;
+            background: linear-gradient(0deg, rgba(172, 204, 243, 0.98) 0%, rgba(255, 255, 255, 0.98) 99.12109375%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+        }
+
+        .tsfw .rlist {
+            display: flex;
+            flex-direction: column;
+            font-size: 26px;
+            color: #FFFFFF;
+            margin-bottom: 50px;
+        }
+
+        .tsfw .rlist p:first-child {
+            margin-bottom: 10px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="tsfw" id="tsfw">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>茶园工业园区特色服务</span>
+            </div>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div class="container">
+            <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%;">
+                        <p>{{item.parkForm}}</p>
+                    </div>
+                    <div class="content">
+                        <div v-for="(tabl, indexl)  in item.children" :key="indexl">
+                            {{indexl+1}}.{{tabl.information}}
+                        </div>
+                    </div>
+                </div>
+                <div class="list" v-if="!leftList.length">
+                    <div class="title">
+                        <img :src="'images/bg-tsfw1.png'" alt="" style="width: 100%;height: 100%;">
+                        <p>- </p>
+                    </div>
+                    <div class="content">
+                    </div>
+                </div>
+            </div>
+            <div class="right">
+                <div class="rlist">
+                    <p>联系人：</p>
+                    <p>{{person?person:'-'}}</p>
+                </div>
+                <div class="rlist">
+                    <p>电话：</p>
+                    <p>{{telphone?telphone:'-'}}</p>
+                </div>
+                <div class="rlist">
+                    <p>地址：</p>
+                    <p>{{address?address:'-'}}</p>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</body>
+<script>
+    // 初始化Vue实例
+    new Vue({
+        el: '#tsfw',
+        data: function () {
+            return {
+                reqPtah: 'http://172.16.99.105:8082',
+                leftList: [],
+                person: '',
+                telphone: '',
+                address: ''
+            };
+        },
+        methods: {
+            getParkData(id) {
+                let that = this;
+                $.ajax({
+                    url: that.reqPtah + "/specialService/listAll/" + id,
+                    type: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        console.log(data.data)
+                        var parkData = data.data.parkData;
+                        that.person = parkData.contacts;
+                        that.telphone = parkData.contactsPhone;
+                        that.address = parkData.contactsAddr;
+                        let value = data.data.data;
+                        let newList = []
+                        value.forEach(item => {
+                            let status = newList.find(el => el.parkForm === item.parkForm) // 判断第一层级，用name属性来判断
+                            if (status) {
+                                status.children.push({ ...item }) // 将数据插入到第二层级中
+                            } else {
+                                let obj = { ...item, children: [{ ...item }] }
+                                newList.push(obj)
+                            }
+                        })
+                        that.leftList = newList;
+                    }
+                })
+            }
+        },
+        mounted() {
+            const url = new URL(window.location.href);
+            const id = url.searchParams.get('id');
+            this.getParkData(id);
+        }
+    });
+</script>
+
+</html>

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

@@ -69,6 +69,10 @@
             padding: 0;
         }
 
+        .content ul li {
+            margin-bottom: 10px;
+        }
+
         .content .list {
             height: 303px;
             background: #FFFFFF;
@@ -126,6 +130,18 @@
             align-items: flex-end;
         }
 
+        .contentleft>.content {
+            width: 100%;
+            margin: auto;
+            height: 1000px;
+            overflow-y: scroll;
+        }
+
+        .contentleft>.content::-webkit-scrollbar {
+            width: 0px;
+            height: 0px;
+        }
+
         .kzsmj {
             display: flex;
             flex-direction: column;
@@ -144,52 +160,67 @@
             line-height: 44px;
             font-style: italic;
         }
+
+        #znxz>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
     </style>
 </head>
 
 <body>
-
-    <div class="toplogo">
-        <img src="images/gyylogo.png" alt="">
-        <span>智能选址 </span>
-    </div>
-    <div style="display: flex;">
-        <div class="contentleft" id="znxz">
-            <div>您好，根据提交的信息为您推荐如下地址：</div>
-            <div class="tjdz">
-                <div class="list" v-for="(item,index) in tjdzList">{{item.name}}</div>
+    <div id="znxz">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>智能选址</span>
             </div>
-            <div class="choseButton">重新选择</div>
-            <div class="content">
-                <div class="list" v-for="(item,index) in contentList">
-                    <div class="left">
-                        <img :src="item.imgsrc" alt="">
-                        <div class="number" style="">{{item.index}}</div>
-                    </div>
-                    <div class="right">
-                        <ul class="item">
-                            <li><span>载体名称：</span><span>{{item.ztmc}}</span></li>
-                            <li><span>可用情况：</span><span>{{item.kyqk}}</span></li>
-                            <li><span>产业板块：</span><span>{{item.cybk}}</span></li>
-                            <li><span>所属园区：</span><span>{{item.ssyq}}</span></li>
-                            <li><span>联系地址：</span><span>{{item.lxdz}}</span></li>
-                            <li><span>联系电话：</span><span>{{item.lxdh}}</span></li>
-                        </ul>
-                        <div class="num">
-                            <div class="tjzb">
-                                <span>推荐指数</span>
-                                <span style="font-weight: bold;font-size: 30px;">{{item.tjzs}}</span>
-                            </div>
-                            <div class="kzsmj">
-                                <span>可招商面积</span>
-                                <span>{{item.kzsmj}}</span>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div style="display: flex;">
+            <div class="contentleft" id="">
+                <div>您好，根据提交的信息为您推荐如下地址：</div>
+                <div class="tjdz">
+                    <div class="list" v-for="(item,index) in tjdzList">{{item.name}}</div>
+                </div>
+                <div class="choseButton">重新选择</div>
+                <div class="content">
+                    <div class="list" v-for="(item,index) in contentList">
+                        <div class="left">
+                            <img :src="item.imgsrc" alt="">
+                            <div class="number" style="">{{item.index}}</div>
+                        </div>
+                        <div class="right">
+                            <ul class="item">
+                                <li><span>载体名称：</span><span>{{item.ztmc}}</span></li>
+                                <li><span>可用情况：</span><span>{{item.kyqk}}</span></li>
+                                <li><span>产业板块：</span><span>{{item.cybk}}</span></li>
+                                <li><span>所属园区：</span><span>{{item.ssyq}}</span></li>
+                                <li><span>联系地址：</span><span>{{item.lxdz}}</span></li>
+                                <li><span>联系电话：</span><span>{{item.lxdh}}</span></li>
+                            </ul>
+                            <div class="num">
+                                <div class="tjzb">
+                                    <span>推荐指数</span>
+                                    <span style="font-weight: bold;font-size: 30px;">{{item.tjzs}}</span>
+                                </div>
+                                <div class="kzsmj">
+                                    <span>可招商面积</span>
+                                    <span>{{item.kzsmj}}</span>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="contentright" id="mapcontainer"></div>
         </div>
-        <div class="contentright" id="mapcontainer"></div>
     </div>
 
 </body>
@@ -254,6 +285,11 @@
                     }
                 ],
             }
+        },
+        methods: {
+            backIndex() {
+                window.history.go(-1)
+            },
         }
     })
 </script>

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

@@ -68,6 +68,7 @@
         .swiper-slide img {
             width: 100%;
             height: 104px;
+            cursor: pointer;
         }
 
         .swiper-button-next,
@@ -98,84 +99,104 @@
             width: 50vw;
             height: 1774px;
         }
+
+        #ztcr>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
     </style>
 </head>
 
 
 <body>
-    <div class="toplogo">
-        <img src="images/gyylogo.png" alt="">
-        <span>载体出让</span>
-    </div>
-    <div style="display: flex;">
-        <div class="contentleft" id="tdcr">
-            <div class="itemname">
-                <div>{{ztcrDetail.carrierName}}</div>
-                <div style="display: flex;">
-                    <div class="topicon" v-for="(item,index) in (ztcrDetail.tag?ztcrDetail.tag.split(','):[])">{{item}}</div>
-                </div>
+    <div id="ztcr">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>载体出让</span>
             </div>
-            <div class="swiperimg">
-                <img :src="imgUrl" alt="" style="width: 75%;height: 394px;">
-                <div class="swiper-button-prev"></div>
-                <div class="swiper mySwiper">
-                    <div class="swiper-wrapper">
-                        <div class="swiper-slide list" v-for="(item,index) in swiperList"
-                            @click="imgDetail(item)">
-                            <img :src="item" alt="">
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
+            </div>
+        </div>
+        <div style="display: flex;">
+            <div class="contentleft">
+                <div class="itemname">
+                    <div>{{ztcrDetail.carrierName}}</div>
+                    <div style="display: flex;">
+                        <div class="topicon" v-for="(item,index) in (ztcrDetail.tag?ztcrDetail.tag.split(','):[])">
+                            {{item}}</div>
+                    </div>
+                </div>
+                <div class="swiperimg">
+                    <img :src="imgUrl" alt="" style="width: 75%;height: 394px;">
+                    <div class="swiper-button-prev"></div>
+                    <div class="swiper mySwiper">
+                        <div class="swiper-wrapper">
+                            <div class="swiper-slide list" v-for="(item,index) in swiperList" @click="imgDetail(item)">
+                                <img :src="item" alt="">
+                            </div>
                         </div>
                     </div>
+                    <div class="swiper-button-next"></div>
                 </div>
-                <div class="swiper-button-next"></div>
-            </div>
-            <div class="list">
-                <div class="listitm" style="background-color: #4EB2AD;">
-                    <span>占地面积</span>
-                    <span>{{ztcrDetail.space}}&nbsp;㎡</span>
+                <div class="list">
+                    <div class="listitm" style="background-color: #4EB2AD;">
+                        <span>占地面积</span>
+                        <span>{{ztcrDetail.space}}&nbsp;㎡</span>
+                    </div>
+                    <div class="listitm" style="background-color: #4B98F6;">
+                        <span>土地用途</span>
+                        <span>{{ztcrDetail.application}}</span>
+                    </div>
+                    <div class="listitm" style="background-color: #4BB664;">
+                        <span>基础设施配套</span>
+                        <span>{{ztcrDetail.basicConfiguration}}</span>
+                    </div>
+                    <div class="listitm" style="background-color: #DFC483;">
+                        <span>可招商面积</span>
+                        <span>{{ztcrDetail.usableArea}}&nbsp;㎡</span>
+                    </div>
                 </div>
-                <div class="listitm" style="background-color: #4B98F6;">
-                    <span>土地用途</span>
-                    <span>{{ztcrDetail.application}}</span>
+                <div class="text">
+                    <div style="align-items: flex-start;">
+                        <span>主导产业：</span>
+                        <div class="icon"
+                            v-for="(item,index) in (ztcrDetail.productModule?ztcrDetail.productModule.split('、'):[])">
+                            {{item}}</div>
+                    </div>
+                    <div><span>详细地址：</span><span>{{ztcrDetail.addr}}</span></div>
+                    <div>
+                        <span>联系方式：</span><span>{{ztcrDetail.contactName}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span>
+                    </div>
                 </div>
-                <div class="listitm" style="background-color: #4BB664;">
-                    <span>基础设施配套</span>
-                    <span>{{ztcrDetail.basicConfiguration}}</span>
+                <div class="buttontz">我要投资</div>
+                <div class="title">
+                    <img src="images/gyy-title1.png" alt="">
+                    <span>概况</span>
                 </div>
-                <div class="listitm" style="background-color: #DFC483;">
-                    <span>可招商面积</span>
-                    <span>{{ztcrDetail.usableArea}}&nbsp;㎡</span>
+                <div class="gk">
+                    {{ztcrDetail.introduce}}
                 </div>
-            </div>
-            <div class="text">
-                <div style="align-items: flex-start;">
-                    <span>主导产业：</span>
-                    <div class="icon" v-for="(item,index) in (ztcrDetail.productModule?ztcrDetail.productModule.split('、'):[])">{{item}}</div>
+                <div class="title">
+                    <img src="images/hyy-yscb.png" alt="">
+                    <span>要素成本</span>
+                </div>
+                <div class="tablecon" v-html="ztcrDetail.cost">
+                </div>
+                <div class="title">
+                    <img src="images/hyy-rzyq.png" alt="">
+                    <span>入住要求</span>
+                </div>
+                <div class="tablecon" v-html="ztcrDetail.checkin">
                 </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">
-                <img src="images/gyy-title1.png" alt="">
-                <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" v-html="ztcrDetail.cost">
-            </div>
-            <div class="title">
-                <img src="images/hyy-rzyq.png" alt="">
-                <span>入住要求</span>
-            </div>
-            <div class="tablecon" v-html="ztcrDetail.checkin">
             </div>
+            <div class="contentright" id="mapcontainer"></div>
         </div>
-        <div class="contentright" id="mapcontainer"></div>
     </div>
 
 </body>
@@ -193,10 +214,10 @@
 </script>
 <script>
     new Vue({
-        el: '#tdcr',
+        el: '#ztcr',
         data: function () {
             return {
-                reqPtah: 'http://172.16.99.105:8082',
+                reqPtah: 'http://172.16.99.102:8082',
                 ztcrDetail: {},
                 imgUrl: 'images/slide1.png',
                 swiperList: [],
@@ -208,6 +229,9 @@
             this.getBuildDetail(id);
         },
         methods: {
+            backIndex() {
+                window.history.go(-1)
+            },
             imgDetail(imgurl) {
                 if (imgurl == "images/tdcr0.png") {
                     return

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

@@ -85,12 +85,15 @@
             list-style-type: none;
             display: flex;
             flex-direction: column;
-            justify-content: space-between;
             padding: 0;
         }
 
+        .contentleft .content ul li {
+            margin-bottom: 15px;
+        }
+
         .contentleft .content .list {
-            height: 303px;
+            height: 280px;
             background: #FFFFFF;
             display: flex;
             margin-top: 30px;
@@ -99,12 +102,12 @@
 
         .contentleft .content .list .left {
             width: 300px;
-            height: 303px;
+            height: 100%;
         }
 
         .contentleft .content .list .left img {
             width: 300px;
-            height: 303px;
+            height: 100%;
         }
 
         .contentleft .content .list .right {
@@ -132,60 +135,75 @@
             width: 50vw;
             height: 1384px;
         }
+
+        #znxz>.top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 1px solid #B7C7DC;
+            background: #FFFFFF;
+        }
     </style>
 </head>
 
 <body>
-
-    <div class="toplogo">
-        <img src="images/gyylogo.png" alt="">
-        <span>载体出让</span>
-    </div>
-    <div style="display: flex;">
-        <div class="contentleft" id="znxz">
-            <div class="title">
-                <img src="images/gyy-title1.png" alt="">
-                <span>条件筛选</span>
+    <div id="znxz">
+        <div class="top">
+            <div class="toplogo">
+                <img src="images/gyylogo.png" alt="">
+                <span>载体出让</span>
             </div>
-            <div class="term">
-                <div class="name">片区</div>
-                <ul class="item">
-                    <li v-for="(item,index) in pqList" :class="{ active: currentPq == item.id }" :key="index"
-                        @click="handleParkChange(item)">{{item.title}}</li>
-                </ul>
+            <div class="backbutton" @click="window.history.go(-1)">
+                <img src="images/back1.png" alt="">
+                <span>返回</span>
             </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="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="handleUseChange(item)">{{item.name}}</li>
-                </ul>
-            </div>
-            <div class="content">
-                <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}}&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.parkData.title}}</span></li>
-                        </ul>
+        </div>
+        <div style="display: flex;">
+            <div class="contentleft">
+                <div class="title">
+                    <img src="images/gyy-title1.png" alt="">
+                    <span>条件筛选</span>
+                </div>
+                <div class="term">
+                    <div class="name">片区</div>
+                    <ul class="item">
+                        <li v-for="(item,index) in pqList" :class="{ active: currentPq == item.id }" :key="index"
+                            @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="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="handleUseChange(item)">{{item.name}}</li>
+                    </ul>
+                </div>
+                <div class="content">
+                    <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}}&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.parkData?item.parkData.title:''}}</span></li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
             </div>
+            <div class="contentright" id="mapcontainer"></div>
         </div>
-        <div class="contentright" id="mapcontainer"></div>
     </div>
 
 </body>
@@ -194,7 +212,7 @@
         el: '#znxz',
         data: function () {
             return {
-                reqPtah: 'http://172.16.99.105:8082',
+                reqPtah: 'http://172.16.99.102:8082',
                 pageSize: 20,
                 parkMap: {},
                 pointList: [],
@@ -274,6 +292,9 @@
             this.getSellBuild();
         },
         methods: {
+            backIndex() {
+                window.history.go(-1)
+            },
             handleParkChange(data) {
                 this.currentPq = data.id;
                 this.getParkDetail();
@@ -373,6 +394,7 @@
                     success: function (data) {
                         let dataList = data.list;
                         that.contentList = dataList;
+                        console.log(that.contentList);
 
                         dataList.forEach(function (d) {
                             // 添加选择地址
@@ -388,4 +410,5 @@
         }
     })
 </script>
+
 </html>