diff --git a/infoport/homestead.html b/infoport/homestead.html index f37a740..7d2e8c9 100644 --- a/infoport/homestead.html +++ b/infoport/homestead.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 @@ -41,11 +41,13 @@ @@ -140,7 +142,7 @@

-

15925781687 王程程

+

{{phone}} {{leader}}

diff --git a/infoport/homesteadDetail.html b/infoport/homesteadDetail.html index 0421363..f7b4791 100644 --- a/infoport/homesteadDetail.html +++ b/infoport/homesteadDetail.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 diff --git a/infoport/index.html b/infoport/index.html index 2865da0..975b888 100644 --- a/infoport/index.html +++ b/infoport/index.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 diff --git a/infoport/newDetail.html b/infoport/newDetail.html index 9ef4e19..8fdcd67 100644 --- a/infoport/newDetail.html +++ b/infoport/newDetail.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 diff --git a/infoport/property.html b/infoport/property.html index 9b1ed9f..909f73e 100644 --- a/infoport/property.html +++ b/infoport/property.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 @@ -41,11 +41,15 @@ @@ -140,10 +144,10 @@

基本信息

-

+

-

15925781687 王程程

+

{{phone}} {{leader}}

diff --git a/infoport/propertyDetail.html b/infoport/propertyDetail.html new file mode 100644 index 0000000..2ca6992 --- /dev/null +++ b/infoport/propertyDetail.html @@ -0,0 +1,187 @@ + + + + + + 乳山农村资源信息港 + + + + + + + + + + + +
+ +
+

+ +

+
+
+ +
+ +
+

新闻资讯

+ +
+
+ +
+ + +
+

资产信息

+ +
+
+ +
+ +
+

资源信息

+ +
+
+ +
+ +
+

宅基地信息

+ +
+
+
+ +
+ + + + + + +
+ + + + +
+ + + \ No newline at end of file diff --git a/infoport/resource.html b/infoport/resource.html index 6a8b4b2..b3b2303 100644 --- a/infoport/resource.html +++ b/infoport/resource.html @@ -4,7 +4,7 @@ - 乳山农村支援信息港 + 乳山农村资源信息港 @@ -41,11 +41,14 @@ @@ -141,10 +144,10 @@

基本信息

-

+

-

15925781687 王程程

+

{{phone}} {{leader}}

diff --git a/infoport/resourceDetail.html b/infoport/resourceDetail.html new file mode 100644 index 0000000..b13959f --- /dev/null +++ b/infoport/resourceDetail.html @@ -0,0 +1,177 @@ + + + + + + 乳山农村资源信息港 + + + + + + + + + + + +
+ +
+

+ +

+
+
+ +
+ +
+

新闻资讯

+ +
+
+ +
+ +
+

资产信息

+ +
+
+ +
+ + +
+

资源信息

+ +
+
+ +
+ +
+

宅基地信息

+ +
+
+
+ +
+ + + + + + +
+ + + + +
+ + + \ No newline at end of file diff --git a/infoport/static/css/homesteadDetail.css b/infoport/static/css/homesteadDetail.css index 6f1f106..dadfb8e 100644 --- a/infoport/static/css/homesteadDetail.css +++ b/infoport/static/css/homesteadDetail.css @@ -148,4 +148,14 @@ } .footer{ margin-top: 0; +} + +.propertyImg img{ + width: 10%; + margin-right: 2%; + margin-bottom: 3vh; +} + +.propertyImg img:nth-child(3n){ + margin-right: 2%; } \ No newline at end of file diff --git a/infoport/static/js/project/homestead.js b/infoport/static/js/project/homestead.js index 0f292a0..8129e1a 100644 --- a/infoport/static/js/project/homestead.js +++ b/infoport/static/js/project/homestead.js @@ -19,6 +19,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function dictValue:'', dictLabel:'全部' }], + propertyDetail:{} }, }; var tools = new Tools(); @@ -33,13 +34,22 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function pageSize: 10, }, module.assetList , true); - + tools.doGet(treeselectSecond+'100', {}, module.useContent, true); tools.doGet(treeselect, {}, module.treeselect , true); tools.doGet(webList, {}, module.webList , true); - tools.doGet(webDeptType+'land_status', {}, module.webDeptType , true); + // tools.doGet(webDeptType+'land_status', {}, module.webDeptType , true); }; + module.useContent = function (data) { + if (data.code == 200) { + module.data.phone = data.data.phone; + module.data.leader = data.data.leader; + var propertyDetailData = template('propertyDetailData', module.data); + $("#propertyDetailContent").html(propertyDetailData); + } + } + module.webDeptType = function (data) { if (data.code == 200) { var content = data.data; @@ -142,9 +152,11 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function module.data.treeselectSecond = [{ value:100, label:'全部' - }] + }]; + tools.doGet(treeselectSecond+'100', {}, module.useContent , true); }else{ module.data.treeselectSecond = module.data.treeselect.filter(function (e) { return e.value == $('#treeselectContent').val(); })[0].children; + tools.doGet(treeselectSecond+$('#treeselectContent').val(), {}, module.useContent , true); } var treeselectSecondData = template('treeselectSecondData', module.data); $("#treeselectSecondContent").html(treeselectSecondData); @@ -162,6 +174,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function pageNum: 1, pageSize: 10, }, module.assetList , true); + tools.doGet(treeselectSecond+$('#treeselectSecondContent').val(), {}, module.useContent , true); //资产列表 // tools.doGet(assetList, { // deptId: $('#treeselectSecondContent').val(), diff --git a/infoport/static/js/project/property.js b/infoport/static/js/project/property.js index 198785a..6f504df 100644 --- a/infoport/static/js/project/property.js +++ b/infoport/static/js/project/property.js @@ -18,6 +18,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function dictValue:'', dictLabel:'全部' }], + propertyDetail:{}, }, }; var tools = new Tools(); @@ -26,7 +27,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function //资产列表 tools.doGet(assetList, { deptId: 100, - useType: 1, + useType: '', operationType: 1, translate_dict: 1, pageNum: 1, @@ -35,13 +36,22 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function isAsc: 'asc', }, module.assetList , true); - + tools.doGet(treeselectSecond+'100', {}, module.useContent , true); tools.doGet(treeselect, {}, module.treeselect , true); tools.doGet(webList, {}, module.webList , true); - tools.doGet(webDeptType+'use_type', {}, module.webDeptType , true); + // tools.doGet(webDeptType+'use_type', {}, module.webDeptType , true); }; + module.useContent = function (data) { + if (data.code == 200) { + module.data.phone = data.data.phone; + module.data.leader = data.data.leader; + var propertyDetailData = template('propertyDetailData', module.data); + $("#propertyDetailContent").html(propertyDetailData); + } + } + module.webDeptType = function (data) { if (data.code == 200) { var content = data.data; @@ -145,8 +155,10 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function value:100, label:'全部' }] + tools.doGet(treeselectSecond+'100', {}, module.useContent , true); }else{ module.data.treeselectSecond = module.data.treeselect.filter(function (e) { return e.value == $('#treeselectContent').val(); })[0].children; + tools.doGet(treeselectSecond+$('#treeselectContent').val(), {}, module.useContent , true); } var treeselectSecondData = template('treeselectSecondData', module.data); $("#treeselectSecondContent").html(treeselectSecondData); @@ -168,6 +180,8 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function orderByColumn: 'code', isAsc: 'asc', }, module.assetList , true); + + tools.doGet(treeselectSecond+$('#treeselectSecondContent').val(), {}, module.useContent , true); } useTypeChange = function () { diff --git a/infoport/static/js/project/propertyDetail.js b/infoport/static/js/project/propertyDetail.js new file mode 100644 index 0000000..b6ba1d5 --- /dev/null +++ b/infoport/static/js/project/propertyDetail.js @@ -0,0 +1,85 @@ +/** + * Created by Administrator on 2021/4/5. + */ +define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function ($, template, Tools) { + //数据存储 + var module = { + data: { + propertyList:'' + }, + }; + var tools = new Tools(); + + module.init = function (page) { + tools.doGet(assetGet+getQueryVariable('id'), {translate_dict: 1}, module.assetDetail , true); + tools.doGet(webList, {}, module.webList , true); + // var map = new BMapGL.Map('container'); // 创建Map实例 + // map.centerAndZoom(new BMapGL.Point(116.320938,39.950026), 18); // 初始化地图,设置中心点坐标和地图级别 + // map.enableScrollWheelZoom(false); // 开启鼠标滚轮缩放 + }; + + module.useContent = function (data) { + if (data.code == 200) { + module.data.phone = data.data.phone; + module.data.leader = data.data.leader; + var propertyDetailData = template('propertyDetailData', module.data); + $("#propertyDetailContent").html(propertyDetailData); + } + } + + module.webList = function (data) { + if (data.code == 200) { + var content = data.rows; + module.data.webList = content; + var webData = template('webData', module.data); + $("#webContent").html(webData); + var titData = template('titData', module.data); + $("#titContent").html(titData); + } + } + + module.assetDetail = function(data){ + if (data.code == 200) { + var content = data.data; + module.data.propertyDetail = content; + tools.doGet(attachmentList, { + tableId:content.id, + tableName: 't_asset_permanent', + bizPath: 'asset' + }, module.attachmentDetail , true); + tools.doGet(treeselectSecond+content.deptId, {}, module.useContent , true); + // var propertyDetailData = template('propertyDetailData', module.data); + // $("#propertyDetailContent").html(propertyDetailData); + // $('#dialog').css('display','block'); + } + } + + module.attachmentDetail = function(data){ + if (data.code == 200) { + var content = data.rows; + var attachmentList = []; + content.map(res=>{ + if (res.fileName.indexOf('png')>-1||res.fileName.indexOf('jpg')>-1){ + attachmentList.push(res); + } + }) + module.data.attachment = attachmentList; + var propertyDetailData = template('propertyDetailData', module.data); + $("#propertyDetailContent").html(propertyDetailData); + $('#dialog').css('display','block'); + } + } + + //获取地址栏参数 + function getQueryVariable(variable){ + var query = window.location.search.substring(1); + var vars = query.split("&"); + for (var i=0;i{ + if (res.fileName.indexOf('png')>-1||res.fileName.indexOf('jpg')>-1){ + attachmentList.push(res); + } + }) + module.data.attachment = attachmentList; + var propertyDetailData = template('propertyDetailData', module.data); + $("#propertyDetailContent").html(propertyDetailData); + $('#dialog').css('display','block'); + } + } + + //获取地址栏参数 + function getQueryVariable(variable){ + var query = window.location.search.substring(1); + var vars = query.split("&"); + for (var i=0;i