diff --git a/infoport/homestead.html b/infoport/homestead.html index c67e262..228daeb 100644 --- a/infoport/homestead.html +++ b/infoport/homestead.html @@ -23,7 +23,7 @@

@@ -123,8 +123,10 @@

-
+
+ +
@@ -215,33 +217,27 @@ diff --git a/infoport/homesteadDetail.html b/infoport/homesteadDetail.html index dbef4b3..64db3b5 100644 --- a/infoport/homesteadDetail.html +++ b/infoport/homesteadDetail.html @@ -22,7 +22,7 @@

@@ -66,6 +66,7 @@ diff --git a/infoport/index.html b/infoport/index.html index 975b888..46de5b8 100644 --- a/infoport/index.html +++ b/infoport/index.html @@ -19,7 +19,7 @@

@@ -67,12 +67,19 @@
-
- -
-
- -
+
@@ -104,39 +111,37 @@
+ + + +
diff --git a/infoport/newDetail.html b/infoport/newDetail.html index 8fdcd67..ba6e2af 100644 --- a/infoport/newDetail.html +++ b/infoport/newDetail.html @@ -48,33 +48,27 @@ diff --git a/infoport/property.html b/infoport/property.html index 6f76ea3..e94e61d 100644 --- a/infoport/property.html +++ b/infoport/property.html @@ -23,7 +23,7 @@

@@ -128,8 +128,10 @@

-
+
+ +
@@ -199,33 +201,27 @@ diff --git a/infoport/propertyDetail.html b/infoport/propertyDetail.html index 56be151..7534145 100644 --- a/infoport/propertyDetail.html +++ b/infoport/propertyDetail.html @@ -22,7 +22,7 @@

@@ -66,6 +66,7 @@ diff --git a/infoport/resource.html b/infoport/resource.html index f56e014..bcd7d59 100644 --- a/infoport/resource.html +++ b/infoport/resource.html @@ -23,7 +23,7 @@

@@ -128,8 +128,10 @@

-
+
+ +
@@ -193,33 +195,27 @@ diff --git a/infoport/resourceDetail.html b/infoport/resourceDetail.html index 1da7212..0baa136 100644 --- a/infoport/resourceDetail.html +++ b/infoport/resourceDetail.html @@ -22,7 +22,7 @@

@@ -66,6 +66,7 @@ diff --git a/infoport/static/css/homesteadDetail.css b/infoport/static/css/homesteadDetail.css index dadfb8e..2e8b030 100644 --- a/infoport/static/css/homesteadDetail.css +++ b/infoport/static/css/homesteadDetail.css @@ -65,6 +65,16 @@ border-radius: 2vh; margin-left: 20px; } +.bigWin{ + background: #ffb400; + height: 2.5vh; + width: 5%; + display: flex; + justify-content: center; + align-items: center; + border-radius: 2vh; + margin-left: 20px; + } .phone{ background: #3fd227; diff --git a/infoport/static/css/main.css b/infoport/static/css/main.css index 1e5d2f9..43f5909 100644 --- a/infoport/static/css/main.css +++ b/infoport/static/css/main.css @@ -2520,6 +2520,8 @@ Basic Swiper Styles .swiper-slide { float: left; + width: 100%; + height: 100%; } .swiper-slide p{ diff --git a/infoport/static/images/back.png b/infoport/static/images/back.png new file mode 100644 index 0000000..a96430f Binary files /dev/null and b/infoport/static/images/back.png differ diff --git a/infoport/static/images/closeBig.png b/infoport/static/images/closeBig.png new file mode 100644 index 0000000..23a2c84 Binary files /dev/null and b/infoport/static/images/closeBig.png differ diff --git a/infoport/static/images/openBig.png b/infoport/static/images/openBig.png new file mode 100644 index 0000000..6694517 Binary files /dev/null and b/infoport/static/images/openBig.png differ diff --git a/infoport/static/js/api/index.js b/infoport/static/js/api/index.js index 5ef11d7..21c2090 100644 --- a/infoport/static/js/api/index.js +++ b/infoport/static/js/api/index.js @@ -82,7 +82,7 @@ var zjdzdxxGet = '/open/house/zjdzdxx/' //查询宅基地详情 /* @purl /open/house/policy/list */ -var webList = '/open/house/policy/list' //查询落款 +var webList = '/open/house/policy/list/level' //查询落款 /* @purl /open/house/policy/get diff --git a/infoport/static/js/project/homestead.js b/infoport/static/js/project/homestead.js index 2ba46ee..dd8f1d5 100644 --- a/infoport/static/js/project/homestead.js +++ b/infoport/static/js/project/homestead.js @@ -58,7 +58,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); @@ -174,6 +174,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function content.map(res=>{ module.data.treeselect.push(res) }) + module.data.treeselectA = data.data[0]; // module.data.treeselect = content[0].children; var treeselectData = template('treeselectData', module.data); $("#treeselectContent").html(treeselectData); @@ -225,7 +226,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }); //加载地图 module.data.map = new ol.Map({ - controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([new ol.control.FullScreen()]), + controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), layers: [aerial, yingxzi], projection: projection, target: "container", @@ -337,5 +338,36 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }, module.assetList , true); } + openBig = function () { + $("#open").css('display','none'); + $(".table_main").css('display','none'); + $(".pageNum").css('display','none'); + $("#close").css('display','block'); + $("#map_main").css({ + 'height': '59vh', + 'position': 'absolute', + 'top': '1vh', + 'width': 'calc(100% - 2vh)', + + }) + $("#container").css('height','59vh') + initMap(module.data.treeselectA); + } + + closeBig = function () { + $("#open").css('display','block'); + $(".table_main").css('display','block'); + $(".pageNum").css('display','block'); + $("#close").css('display','none'); + $("#map_main").css({ + 'height': '16vh', + 'position': 'relative', + 'width': '100%', + 'top': '0vh', + }) + $("#container").css('height','16vh') + initMap(module.data.treeselectA); + } + return module; }); \ No newline at end of file diff --git a/infoport/static/js/project/homesteadDetail.js b/infoport/static/js/project/homesteadDetail.js index 2c4a0ea..dbc0356 100644 --- a/infoport/static/js/project/homesteadDetail.js +++ b/infoport/static/js/project/homesteadDetail.js @@ -101,7 +101,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); diff --git a/infoport/static/js/project/index.js b/infoport/static/js/project/index.js index 3fcde94..50940e7 100644 --- a/infoport/static/js/project/index.js +++ b/infoport/static/js/project/index.js @@ -10,6 +10,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, //焦点图数据 focusList: [], communicateList: [], + newImgList:[] }, }; var tools = new Tools(); @@ -35,12 +36,22 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, module.data.newList = content; var newListData = template('newListData', module.data); $("#newListContent").html(newListData); + + var newImgList = []; + content.map(rr=>{ + if (rr.infoImg!=null&&rr.infoImg!=""){ + newImgList.push(rr.infoImg); + } + }) + module.data.newImgList = newImgList; + var newListDataImg = template('newListDataImg', module.data); + $("#bannerFocusNextContent").html(newListDataImg); } } module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); diff --git a/infoport/static/js/project/new.js b/infoport/static/js/project/new.js index 6df4b23..95d93f8 100644 --- a/infoport/static/js/project/new.js +++ b/infoport/static/js/project/new.js @@ -35,7 +35,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); diff --git a/infoport/static/js/project/property.js b/infoport/static/js/project/property.js index 7d6fe69..375edd1 100644 --- a/infoport/static/js/project/property.js +++ b/infoport/static/js/project/property.js @@ -55,7 +55,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); @@ -178,7 +178,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function content.map(res=>{ module.data.treeselect.push(res) }) - // module.data.treeselect = content[0].children; + module.data.treeselectA = data.data[0]; var treeselectData = template('treeselectData', module.data); $("#treeselectContent").html(treeselectData); var treeselectSecondData = template('treeselectSecondData', module.data); @@ -232,7 +232,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }); //加载地图 module.data.map = new ol.Map({ - controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([new ol.control.FullScreen()]), + controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), layers: [aerial, yingxzi], projection: projection, target: "container", @@ -338,5 +338,36 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }, module.assetList , true); } + openBig = function (pageNum) { + $("#open").css('display','none'); + $(".table_main").css('display','none'); + $(".pageNum").css('display','none'); + $("#close").css('display','block'); + $("#map_main").css({ + 'height': '59vh', + 'position': 'absolute', + 'top': '1vh', + 'width': 'calc(100% - 2vh)', + + }) + $("#container").css('height','59vh') + initMap(module.data.treeselectA); + } + + closeBig = function (pageNum) { + $("#open").css('display','block'); + $(".table_main").css('display','block'); + $(".pageNum").css('display','block'); + $("#close").css('display','none'); + $("#map_main").css({ + 'height': '16vh', + 'position': 'relative', + 'width': '100%', + 'top': '0vh', + }) + $("#container").css('height','16vh') + initMap(module.data.treeselectA); + } + return module; }); \ No newline at end of file diff --git a/infoport/static/js/project/propertyDetail.js b/infoport/static/js/project/propertyDetail.js index a322004..99e15e1 100644 --- a/infoport/static/js/project/propertyDetail.js +++ b/infoport/static/js/project/propertyDetail.js @@ -106,7 +106,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); diff --git a/infoport/static/js/project/resource.js b/infoport/static/js/project/resource.js index 058e135..a64004d 100644 --- a/infoport/static/js/project/resource.js +++ b/infoport/static/js/project/resource.js @@ -57,7 +57,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData); @@ -174,6 +174,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.data.treeselect.push(res) }) // module.data.treeselect = content[0].children; + module.data.treeselectA = data.data[0]; var treeselectData = template('treeselectData', module.data); $("#treeselectContent").html(treeselectData); var treeselectSecondData = template('treeselectSecondData', module.data); @@ -223,7 +224,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }); //加载地图 module.data.map = new ol.Map({ - controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([new ol.control.FullScreen()]), + controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), layers: [aerial, yingxzi], projection: projection, target: "container", @@ -332,5 +333,36 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function }, module.assetList , true); } + openBig = function () { + $("#open").css('display','none'); + $(".table_main").css('display','none'); + $(".pageNum").css('display','none'); + $("#close").css('display','block'); + $("#map_main").css({ + 'height': '59vh', + 'position': 'absolute', + 'top': '1vh', + 'width': 'calc(100% - 2vh)', + + }) + $("#container").css('height','59vh') + initMap(module.data.treeselectA); + } + + closeBig = function () { + $("#open").css('display','block'); + $(".table_main").css('display','block'); + $(".pageNum").css('display','block'); + $("#close").css('display','none'); + $("#map_main").css({ + 'height': '16vh', + 'position': 'relative', + 'width': '100%', + 'top': '0vh', + }) + $("#container").css('height','16vh') + initMap(module.data.treeselectA); + } + return module; }); \ No newline at end of file diff --git a/infoport/static/js/project/resourceDetail.js b/infoport/static/js/project/resourceDetail.js index 48cf54b..353ad9f 100644 --- a/infoport/static/js/project/resourceDetail.js +++ b/infoport/static/js/project/resourceDetail.js @@ -99,7 +99,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.webList = function (data) { if (data.code == 200) { - var content = data.rows; + var content = data.data; module.data.webList = content; var webData = template('webData', module.data); $("#webContent").html(webData);