diff --git a/infoport/discussions.html b/infoport/discussions.html index 0c718a1..685f13c 100644 --- a/infoport/discussions.html +++ b/infoport/discussions.html @@ -115,6 +115,7 @@ + @@ -154,8 +155,9 @@ {{each newList2 as value i}}
{{value.name}} -

{{value.code}}

-

{{value.totalAmount}}元

+

{{value.secondParty}}

+

{{value.startTime}} ~ {{value.endTime}}

+

{{value.totalAmount}}元

{{/each}} @@ -269,8 +271,9 @@ {{each newList7 as value i}}
{{value.name}} -

{{value.code}}

-

{{value.buildTime}}

+

{{value.originalValue}}

+

{{value.operationType}}

+

{{value.assetStatus}}

{{/each}} @@ -292,9 +295,9 @@ {{each newList8 as value i}}
{{value.name}} -

{{value.code}}

{{value.totalArea}}亩

-

{{value.resourceType}}

+

{{value.resourceType}}

+

{{value.useType}}

{{/each}} @@ -325,6 +328,27 @@ + + diff --git a/infoport/discussionsDetail_10.html b/infoport/discussionsDetail_10.html new file mode 100644 index 0000000..839742f --- /dev/null +++ b/infoport/discussionsDetail_10.html @@ -0,0 +1,105 @@ + + + + + + 农村资源信息港 + + + + + + + + + + +
+ +
+
+
+ +

+
+
+

+

+
+
+
+
+
+
+
+
+
实施过程公开列表
+
+ +
+
+
+ + + +
+ + + + + +
+ + + + +
+ + + diff --git a/infoport/static/images/index_code_btn_10.png b/infoport/static/images/index_code_btn_10.png new file mode 100644 index 0000000..3a79802 Binary files /dev/null and b/infoport/static/images/index_code_btn_10.png differ diff --git a/infoport/static/js/api/index.js b/infoport/static/js/api/index.js index 86ccf57..3f8e883 100644 --- a/infoport/static/js/api/index.js +++ b/infoport/static/js/api/index.js @@ -131,3 +131,7 @@ var assetresourceOrcodeList = '/open/assetresource/orcode/list' var tempWorkerPublicList = '/open/villageAffairs/public/tempWorkerPublicList' var tempWorkerPublicDetail = '/open/villageAffairs/public/tempWorkerPublicDetail' + +var otherPublicList = '/open/villageAffairs/public/otherPublicList' + +var otherPublicDetail = '/open/villageAffairs/public/otherPublicDetail' diff --git a/infoport/static/js/project/discussions.js b/infoport/static/js/project/discussions.js index b0b746f..c223201 100644 --- a/infoport/static/js/project/discussions.js +++ b/infoport/static/js/project/discussions.js @@ -20,6 +20,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, newList7:[], newList8:[], newList9:[], + newList10:[], pageNum1: 1, pageNum2: 1, pageNum3: 1, @@ -29,6 +30,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, pageNum7: 1, pageNum8: 1, pageNum9: 1, + pageNum10: 1, }, }; var tools = new Tools(); @@ -145,6 +147,16 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, changeList('9'); } }); + + var ulbox10 = document.getElementById("review_box10"); + ulbox10.scrollTop = 0; // 开始无滚动时设为0 + + ulbox10.addEventListener('scroll', function() { + if (ulbox10.scrollHeight - ulbox10.scrollTop === ulbox10.clientHeight) { + module.data.pageNum10 += 1; + changeList('10'); + } + }); }; module.newsList4 = function (data) { @@ -163,6 +175,22 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, } } + module.newsList10 = function (data) { + if (data.code == 200) { + var content = data.rows; + if (module.data.newList10.length >= data.total){ + return; + }else{ + for (let i = 0 ; i < content.length ; i++){ + module.data.newList10.push(content[i]); + } + } + // module.data.newList4 = content; + var newListData10 = template('newListData10', module.data); + $("#newListContent_ul_10").html(newListData10); + } + } + module.newsList7 = function (data) { if (data.code == 200) { var content = data.rows; @@ -272,6 +300,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, $('#new_list_7').css('display','none'); $('#new_list_8').css('display','none'); $('#new_list_9').css('display','none'); + $('#new_list_10').css('display','none'); switch (type) { case '1': @@ -375,6 +404,18 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, $('#new_list_9').css('display','block'); $("#nowDateNYR9").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); break; + + case '10': + $('#new_list_10').css('display','block'); + $("#nowDateNYR10").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(otherPublicList, { + pageNum:module.data.pageNum10, + pageSize:10, + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId, + otherType: 13 + }, module.newsList10 , true); + break; default: break; diff --git a/infoport/static/js/project/discussionsDetail_10.js b/infoport/static/js/project/discussionsDetail_10.js new file mode 100644 index 0000000..9e529dc --- /dev/null +++ b/infoport/static/js/project/discussionsDetail_10.js @@ -0,0 +1,107 @@ +/** + * Created by Administrator on 2021/4/5. + */ +define(['jquery', "template", "Tools"], function ($, template, Tools) { + //数据存储 + var module = { + data: { + //服务器地址 + serverApi:'', + //焦点图数据 + focusList: [], + communicateList: [], + }, + }; + var tools = new Tools(); + + module.init = function (page) { + //新闻详情 + tools.doGet(otherPublicDetail, { + id:getQueryVariable('id'), + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsDetail , true); + //新闻列表 + tools.doGet(otherPublicList, { + pageNum:1, + pageSize:10, + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId, + otherType: 13 + }, module.newsList , true); + tools.doGet(webList, {}, module.webList , true); + }; + + //获取地址栏参数 + function getQueryVariable(variable){ + var query = window.location.search.substring(1); + var vars = query.split("&"); + for (var i=0;i'; + } + } + + $('#openFile')[0].innerHTML = '附件：
'; + + if (content.openFile){ + let arr2 = content.openFile.split(','); + for (let i = 0;i < arr2.length; i++){ + $('#openFile')[0].innerHTML += ''+arr2[i].substr(27,arr2[i].length)+''; + } + } + + $('#content')[0].innerHTML = '内容：'+content.content; + $('#remark')[0].innerHTML = '备注：'+content.remark; + + } + } + + openDialog = function (src){ + $("#dialogOp").css('display','block'); + $('#dialogImg').attr('src', src); + } + + closeDia = function (){ + $("#dialogOp").css('display','none'); + $('#dialogImg').attr('src', ''); + } + + module.newsList = function (data) { + if (data.code == 200) { + var content = data.rows; + module.data.newList = content; + var newListData = template('newListData', module.data); + $("#newListContent").html(newListData); + } + } + + return module; +});