From e5a976c6b4f5469d50b78da45e8f5d3db27a85ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Fri, 9 Jun 2023 14:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E6=9D=91=E8=B5=84=E6=BA=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=B8=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infoport/homestead.html | 34 +++++----- infoport/homesteadDetail.html | 31 ++++----- infoport/index.html | 61 ++++++++++-------- infoport/newDetail.html | 28 ++++---- infoport/property.html | 34 +++++----- infoport/propertyDetail.html | 31 ++++----- infoport/resource.html | 34 +++++----- infoport/resourceDetail.html | 31 ++++----- infoport/static/css/homesteadDetail.css | 10 +++ infoport/static/css/main.css | 2 + infoport/static/images/back.png | Bin 0 -> 340 bytes infoport/static/images/closeBig.png | Bin 0 -> 691 bytes infoport/static/images/openBig.png | Bin 0 -> 707 bytes infoport/static/js/api/index.js | 2 +- infoport/static/js/project/homestead.js | 36 ++++++++++- infoport/static/js/project/homesteadDetail.js | 2 +- infoport/static/js/project/index.js | 13 +++- infoport/static/js/project/new.js | 2 +- infoport/static/js/project/property.js | 37 ++++++++++- infoport/static/js/project/propertyDetail.js | 2 +- infoport/static/js/project/resource.js | 36 ++++++++++- infoport/static/js/project/resourceDetail.js | 2 +- 22 files changed, 259 insertions(+), 169 deletions(-) create mode 100644 infoport/static/images/back.png create mode 100644 infoport/static/images/closeBig.png create mode 100644 infoport/static/images/openBig.png 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 0000000000000000000000000000000000000000..a96430f36edb01dee2cd455d480885fa12a67dc6 GIT binary patch literal 340 zcmV-a0jvIrP)Px$4oO5oR5(w?lf6nqK@^0)sck|Kd;u$kJV8)X`U>#}EKDURDI$Up(DWfi8X*u{ zD=QK64pG5E&_XL;ziTH>-^cTkP)4oO9-!6}e@56KF}Q<=>{AHF;^f37h~s zl5T$`VEY270NavYW5@v`+e^R=@GNO7mYCs!fFnrPzyk0HTuOSH6j%iA(hTa;#B7&< z4PXt}2YQlDlM*t5?E$a?>`Ho>m6h#PpaZ;1I?8t;sGk9QMP0C6211wm-vmO`G(sCV zl=M-MNdu_<5Qs1|f!JOKM*k}C_Yw+CoaaGm@;UG(sTt)#I!Nn4*atvY(sA||!th)H mVL)cBPv9PS0EUvr8So3Q3t_*1MZjqQ0000Bx7&j3oaT37Y}Ku`z4Fp2;^Z~ztntWQux+y+qNI-=_nmJucvz_gw#8jVI~ zZ*Om1mgQ%$SnO6$XqwLKg`T2fu^96Cd`tA)YPA%e=U;Z?>^O_Z!H`{UFgPgx!n6`H2P5&nZaOS6h(Q? zaooV}Xo)b+HhR5Yvz92E&F*T6#*!^AE?WEFsj8~x^Z9SX=8P-BoGTCJWp8jTCBIlA7ns~DP@#bV($H#hIP z-EN!H>9pGIc8kqsvzpE3sZ1vGZewHPi*7QGk71C@1jbR_92OC%DWR4Vm|VHl=Ac6fMruA3~KPA{d? z=}7kvAqc{m-|v5Qe0*G{KY6WI(=6?)7$^`DC6mceH=|0W@*@}wzBxTTZToz_x1mtT zHHrvY_pDy8KXEu5H)vccm8#3j%Xv{0FGm&hLT$nQ-V9GpPQI_Mu6oMlvJeOaw)GNG zw?&yf1~9ABg8!mI1#s{mM8pAYqu8lRYPTi@^^IRiMpUS;qgDdIROc+mg|3GHV3$My Z@CP$$)Fz)Sp(g+U002ovPDHLkV1f#@M0@}M literal 0 HcmV?d00001 diff --git a/infoport/static/images/openBig.png b/infoport/static/images/openBig.png new file mode 100644 index 0000000000000000000000000000000000000000..66945176ce6b9648abd76108649e702d93489bb5 GIT binary patch literal 707 zcmV;!0zCbRP)F`vArP zT!(x$0Bi&J2!Nx}MA%~hQv(28q%45U5P&-Xo?aq|WC5@{bOyR{$uQFBRRAVABX~R> zlhf%OpO~1?8jVJcUa!~cbUJl9o&N0ccs~60s)=BX9N5y*(gTOXaaS5=Sym+pF$y^# zlFQ|K%k%uUG`_dDcPNd?hFL6@VU0$kmd1<4;{HHklarI0R4O&6)9EzQXZd{oU|=wt z%{G!qBxYHbJ$14m2!h}5k8&JWpnfiw>qsM6|6#8ntJON3&1UDu#>NaHXklR?914XB z(P;FG$z*B-gTb%ucKh6Sbb`F;6&8!dreOUtx=ji?=96)VAC0DiMS;doM39zwZ~;VUT1p z`FwtU{$9CUE``J4X9j~oFM`P4@pyci**64To`UoOt<`Er)oOLWQmGu4 zN~MEBq42%cYPByOrYkkbATI#il>66RXp2&__8&l`HQHyDv$dmg>#{_3<0pcV=+vgo pItqXa6)`SHR1xz4-Vq1@P5>>r-?X7Xn>zpi002ovPDHLkV1f;XP{ 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);