diff --git a/infoport/discussions.html b/infoport/discussions.html index d88be8a..8c8d1b1 100644 --- a/infoport/discussions.html +++ b/infoport/discussions.html @@ -115,7 +115,8 @@ - + + @@ -366,6 +367,31 @@ + + diff --git a/infoport/discussionsDetail.html b/infoport/discussionsDetail.html index ffc1b79..d20e411 100644 --- a/infoport/discussionsDetail.html +++ b/infoport/discussionsDetail.html @@ -29,6 +29,8 @@
+
+
diff --git a/infoport/discussionsDetail_02.html b/infoport/discussionsDetail_02.html index 6677bc5..f72bb4e 100644 --- a/infoport/discussionsDetail_02.html +++ b/infoport/discussionsDetail_02.html @@ -40,6 +40,18 @@
+ +
+ +
+
合同公开列表
diff --git a/infoport/discussionsDetail_03_zy.html b/infoport/discussionsDetail_03_zy.html index 1db52cf..28b0462 100644 --- a/infoport/discussionsDetail_03_zy.html +++ b/infoport/discussionsDetail_03_zy.html @@ -38,7 +38,7 @@
diff --git a/infoport/discussionsDetail_08.html b/infoport/discussionsDetail_08.html index 746d4b5..700b66c 100644 --- a/infoport/discussionsDetail_08.html +++ b/infoport/discussionsDetail_08.html @@ -37,7 +37,7 @@
diff --git a/infoport/discussionsDetail_10.html b/infoport/discussionsDetail_10.html index 59758f5..66100b8 100644 --- a/infoport/discussionsDetail_10.html +++ b/infoport/discussionsDetail_10.html @@ -38,7 +38,7 @@
diff --git a/infoport/discussionsDetail_11.html b/infoport/discussionsDetail_11.html new file mode 100644 index 0000000..3a47e4c --- /dev/null +++ b/infoport/discussionsDetail_11.html @@ -0,0 +1,107 @@ + + + + + + 农村资源信息港 + + + + + + + + + + +
+ +
+
+
+ +

+
+
+

+

+
+
+
+
+
+
+
+
+
+
+
专项公示列表
+
+ +
+
+
+ + + +
+ + + + + +
+ + + + +
+ + + diff --git a/infoport/static/images/index_code_btn_11.png b/infoport/static/images/index_code_btn_11.png new file mode 100644 index 0000000..facbe0b Binary files /dev/null and b/infoport/static/images/index_code_btn_11.png differ diff --git a/infoport/static/js/api/index.js b/infoport/static/js/api/index.js index 524a2bb..aa5a4cd 100644 --- a/infoport/static/js/api/index.js +++ b/infoport/static/js/api/index.js @@ -139,3 +139,7 @@ var tempWorkerPublicDetail = '/open/villageAffairs/public/tempWorkerPublicDetail var otherPublicList = '/open/villageAffairs/public/otherPublicList' var otherPublicDetail = '/open/villageAffairs/public/otherPublicDetail' + +var specialPublicityList = '/open/villageAffairs/public/specialPublicityList' + +var specialPublicityDetail = '/open/villageAffairs/public/specialPublicityDetail' diff --git a/infoport/static/js/project/discussions.js b/infoport/static/js/project/discussions.js index c779085..b71f65f 100644 --- a/infoport/static/js/project/discussions.js +++ b/infoport/static/js/project/discussions.js @@ -22,6 +22,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, newList9:[], newList10:[], newList11:[], + newList12:[], pageNum1: 1, pageNum2: 1, pageNum3: 1, @@ -33,6 +34,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, pageNum9: 1, pageNum10: 1, pageNum11: 1, + pageNum12: 1, }, }; var tools = new Tools(); @@ -169,6 +171,16 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, changeList('10'); } }); + + var ulbox11 = document.getElementById("review_box11"); + ulbox11.scrollTop = 0; // 开始无滚动时设为0 + + ulbox11.addEventListener('scroll', function() { + if (ulbox11.scrollHeight - ulbox11.scrollTop === ulbox11.clientHeight) { + module.data.pageNum12 += 1; + changeList('11'); + } + }); }; module.newsList4 = function (data) { @@ -351,6 +363,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, $('#new_list_8').css('display','none'); $('#new_list_9').css('display','none'); $('#new_list_10').css('display','none'); + $('#new_list_11').css('display','none'); switch (type) { case '1': @@ -466,6 +479,18 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, otherType: 13 }, module.newsList10 , true); break; + + case '11': + $('#new_list_11').css('display','block'); + $("#nowDateNYR11").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(specialPublicityList, { + pageNum:module.data.pageNum12, + translate_dict:"1", + pageSize:10, + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId, + }, module.newsList12 , true); + break; default: break; @@ -536,6 +561,22 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, } } + module.newsList12 = function (data) { + if (data.code == 200) { + var content = data.rows; + if (module.data.newList12.length >= data.total){ + return; + }else{ + for (let i = 0 ; i < content.length ; i++){ + module.data.newList12.push(content[i]); + } + } + // module.data.newList3 = content; + var newListData11 = template('newListData11', module.data); + $("#newListContent_ul_11").html(newListData11); + } + } + function roll(t) { var ul1 = document.getElementById("newListContent"); var ul2 = document.getElementById("newListContent2"); diff --git a/infoport/static/js/project/discussionsDetail.js b/infoport/static/js/project/discussionsDetail.js index 4f17a4c..d0798c6 100644 --- a/infoport/static/js/project/discussionsDetail.js +++ b/infoport/static/js/project/discussionsDetail.js @@ -47,9 +47,9 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { if (data.code == 200) { var content = data.data; $('#name')[0].innerHTML = content.openName; - $('#jueyiAt')[0].innerHTML = '決议公开日期：'+content.jueyiAt; + $('#jueyiAt')[0].innerHTML = '决议公开日期：'+(content.jueyiAt || ''); - $('#jueyiPic')[0].innerHTML = '決议公开图片：
'; + $('#jueyiPic')[0].innerHTML = '决议公开图片：
'; if (content.jueyiPic){ let arr = content.jueyiPic.split(','); for (let i = 0;i < arr.length; i++){ @@ -57,17 +57,27 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#shishiPic')[0].innerHTML = '实施公开图片：
'; + $('#shishiPic')[0].innerHTML = '实施结果公开图片：
'; if (content.shishiPic){ - let arr2 = content.jueyiPic.split(','); + let arr2 = content.shishiPic.split(','); for (let i = 0;i < arr2.length; i++){ $('#shishiPic')[0].innerHTML += ''; } } - $('#shishiAt')[0].innerHTML = '实施公开日期：'+content.shishiAt; + $('#shishiAt')[0].innerHTML = '实施结果公开日期：' + ( content.shishiAt || '' ); - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#shishiguochengPic')[0].innerHTML = '实施过程公开图片：
'; + if (content.shishiguochengPic){ + let arr3 = content.shishiguochengPic.split(','); + for (let i = 0;i < arr3.length; i++){ + $('#shishiguochengPic')[0].innerHTML += ''; + } + } + + $('#shishiguochengAt')[0].innerHTML = '实施过程公开日期：' + ( content.shishiguochengAt || '' ); + + $('#remark')[0].innerHTML = '备注：'+(content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_01.js b/infoport/static/js/project/discussionsDetail_01.js index 9776160..4b9a19b 100644 --- a/infoport/static/js/project/discussionsDetail_01.js +++ b/infoport/static/js/project/discussionsDetail_01.js @@ -96,7 +96,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#shishiPic')[0].innerHTML = '附件：
'; + $('#shishiPic')[0].innerHTML = '公开文件：
'; if (content.openFile){ let arr2 = content.openFile.split(','); @@ -105,7 +105,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#remark')[0].innerHTML = '备注：' + (content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_02.js b/infoport/static/js/project/discussionsDetail_02.js index a7df871..141898d 100644 --- a/infoport/static/js/project/discussionsDetail_02.js +++ b/infoport/static/js/project/discussionsDetail_02.js @@ -61,17 +61,39 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { var content = data.rows[0]; $('#name').html(content.name); $('#code').html('合同编码：' + content.code); - $('#biddingType').html('合同类型：'+content.assetType); - $('#secondParty').html('合同乙方：'+content.secondParty); - $('#settleType').html('结款方式：'+content.settleType); - $('#totalAmount').html('合同金额：'+content.totalAmount + '元'); - $('#settledAmount').html('已结款：'+content.settledAmount + '元'); - $('#receivedAmount').html('下次应结：'+content.receivedAmount + '元'); - $('#num').html('数量：'+content.num); - $('#unit').html('单位：'+content.unit); - $('#buildingTime').html('签订日期：'+content.buildingTime); - $('#startTime').html('开始日期：'+content.startTime); - $('#endTime').html('结束日期：'+content.endTime); + $('#biddingType').html('合同类型：'+(content.assetType || '')); + $('#secondParty').html('合同乙方：'+(content.secondParty || '')); + $('#settleType').html('结款方式：'+(content.settleType || '')); + $('#totalAmount').html('合同金额：'+(content.totalAmount || '') + '元'); + $('#settledAmount').html('已结款：'+(content.settledAmount || '') + '元'); + $('#receivedAmount').html('下次应结：'+(content.receivedAmount || '') + '元'); + $('#num').html('数量：'+(content.num || '')); + $('#unit').html('单位：'+(content.unit || '')); + $('#buildingTime').html('签订日期：'+(content.buildingTime || '')); + $('#startTime').html('开始日期：'+(content.startTime || '')); + $('#endTime').html('结束日期：'+(content.endTime || '')); + //新闻列表 + tools.doGet(attachmentList, { + tableId: content.id, + tableName: 't_contraction_info', + bizPath: 'contraction', + }, module.NewsInformation , true); + } + } + module.NewsInformation = function (data) { + console.log(data) + if (data.code == 200) { + var content = data.rows; + let list = []; + content.map(rr=>{ + list.push({ + fileUrl:rr.fileUrl, + fileName:rr.fileName + }) + }) + module.data.attachmentList = list; + var attachmentListData = template('attachmentListData', module.data); + $("#attachmentListContent").html(attachmentListData); } } diff --git a/infoport/static/js/project/discussionsDetail_03.js b/infoport/static/js/project/discussionsDetail_03.js index ac4ef07..badb0a8 100644 --- a/infoport/static/js/project/discussionsDetail_03.js +++ b/infoport/static/js/project/discussionsDetail_03.js @@ -78,8 +78,8 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#content')[0].innerHTML = '内容：'+content.content; - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#content')[0].innerHTML = '内容：'+(content.content || ''); + $('#remark')[0].innerHTML = '备注：'+(content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_03_zy.js b/infoport/static/js/project/discussionsDetail_03_zy.js index c019c6d..6df62d3 100644 --- a/infoport/static/js/project/discussionsDetail_03_zy.js +++ b/infoport/static/js/project/discussionsDetail_03_zy.js @@ -75,12 +75,12 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { 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)+''; + $('#openFile')[0].innerHTML += ''+arr2[i].substr(27,arr2[i].length)+''; } } - $('#content')[0].innerHTML = '内容：'+content.content; - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#content')[0].innerHTML = '内容：'+(content.content || ''); + $('#remark')[0].innerHTML = '备注：'+(content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_06.js b/infoport/static/js/project/discussionsDetail_06.js index 5c12f10..118ca83 100644 --- a/infoport/static/js/project/discussionsDetail_06.js +++ b/infoport/static/js/project/discussionsDetail_06.js @@ -60,15 +60,15 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { if (data.code == 200) { var content = data.rows[0]; $('#name').html(content.name); - $('#code').html('资产编码：' + content.code); - $('#biddingType').html('资产类别：'+content.assetType); - $('#operationType').html('经营属性：'+content.operationType); - $('#secondParty').html('构建时间：'+content.buildTime); - $('#location').html('坐落位置：'+content.location); - $('#settleType').html('使用情况：'+content.useType); - $('#totalAmount').html('数量/建筑面积：'+content.netValue); - $('#settledAmount').html('计量单位：'+content.unit); - $('#receivedAmount').html('原值：'+content.originalValue); + $('#code').html('资产编码：' + (content.code || '')); + $('#biddingType').html('资产类别：'+(content.assetType || '')); + $('#operationType').html('经营属性：'+(content.operationType || '')); + $('#secondParty').html('构建时间：'+(content.buildTime || '')); + $('#location').html('坐落位置：'+(content.location || '')); + $('#settleType').html('使用情况：'+(content.useType || '')); + $('#totalAmount').html('数量/建筑面积：'+(content.netValue || '')); + $('#settledAmount').html('计量单位：'+(content.unit || '')); + $('#receivedAmount').html('原值：'+(content.originalValue || '')); } } diff --git a/infoport/static/js/project/discussionsDetail_07.js b/infoport/static/js/project/discussionsDetail_07.js index e1ef827..ffe1be1 100644 --- a/infoport/static/js/project/discussionsDetail_07.js +++ b/infoport/static/js/project/discussionsDetail_07.js @@ -58,16 +58,16 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { if (data.code == 200) { var content = data.rows[0]; $('#name').html(content.name); - $('#code').html('资源编码：' + content.code); - $('#biddingType').html('资源分类：'+content.resourceSort); - $('#secondParty').html('资源类型：'+content.resourceType); + $('#code').html('资源编码：' + (content.code || '')); + $('#biddingType').html('资源分类：'+(content.resourceSort || '')); + $('#secondParty').html('资源类型：'+(content.resourceType || '')); $('#location').html('坐落位置：'+(content.location || '')); $('#east').html('东至：'+(content.east || '')); $('#west').html('西至：'+(content.west || '')); $('#south').html('南至：'+(content.south || '')); $('#north').html('北至：'+(content.north || '')); - $('#settleType').html('面积：'+content.totalArea + '亩'); - $('#totalAmount').html('使用情况：'+content.useType); + $('#settleType').html('面积：'+(content.totalArea || '') + '亩'); + $('#totalAmount').html('使用情况：'+(content.useType || '')); } } diff --git a/infoport/static/js/project/discussionsDetail_08.js b/infoport/static/js/project/discussionsDetail_08.js index 9faff1b..6ca3b58 100644 --- a/infoport/static/js/project/discussionsDetail_08.js +++ b/infoport/static/js/project/discussionsDetail_08.js @@ -80,7 +80,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#remark')[0].innerHTML = '备注：'+(content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_10.js b/infoport/static/js/project/discussionsDetail_10.js index e4aa411..a804dc7 100644 --- a/infoport/static/js/project/discussionsDetail_10.js +++ b/infoport/static/js/project/discussionsDetail_10.js @@ -78,8 +78,8 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) { } } - $('#content')[0].innerHTML = '内容：'+content.openContent; - $('#remark')[0].innerHTML = '备注：'+content.remark; + $('#content')[0].innerHTML = '内容：'+(content.openContent || ''); + $('#remark')[0].innerHTML = '备注：'+(content.remark || ''); } } diff --git a/infoport/static/js/project/discussionsDetail_11.js b/infoport/static/js/project/discussionsDetail_11.js new file mode 100644 index 0000000..7533899 --- /dev/null +++ b/infoport/static/js/project/discussionsDetail_11.js @@ -0,0 +1,125 @@ +/** + * Created by Administrator on 2021/4/5. + */ +define(['jquery', "template", "Tools"], function ($, template, Tools) { + //数据存储 + var module = { + data: { + //服务器地址 + serverApi:'', + //焦点图数据 + focusList: [], + communicateList: [], + specialPublicityTypeOptions: [], + }, + }; + var tools = new Tools(); + + module.init = function (page) { + //新闻列表 + tools.doGet(specialPublicityList, { + pageNum:module.data.pageNum12, + translate_dict:"1", + pageSize:10, + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId, + }, module.newsList , true); + tools.doGet(webList, {}, module.webList , true); + tools.doGet(webDeptType+"/special_publicity_type", {}, module.deptType,true); + }; + + //标的物类型 + module.deptType = function (data) { + if (data.code == 200) { + var content = data.data ; + module.data.specialPublicityTypeOptions = content; + //新闻详情 + tools.doGet(specialPublicityDetail, { + id:getQueryVariable('id'), + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsDetail , true); + } + } + + //获取地址栏参数 + function getQueryVariable(variable){ + var query = window.location.search.substring(1); + var vars = query.split("&"); + for (var i=0;i'; + } + } + $('#qrcode')[0].innerHTML = '二维码图片：
'; + if (content.qrcode){ + let arr2 = content.qrcode.split(','); + for (let i = 0;i < arr2.length; i++){ + $('#qrcode')[0].innerHTML += ''; + } + } + $('#specialPublicityType')[0].innerHTML = '公示类型：'+(content.specialPublicityType || ''); + $('#differCount')[0].innerHTML = '有异议数：'+(content.differCount || ''); + $('#agreeCount')[0].innerHTML = '无异议数：'+(content.agreeCount || ''); + $('#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); + } + } + + module.selectDictLabel = function (datas, value) { + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].dictValue == ('' + value)) { + actions.push(datas[key].dictLabel); + return true; + } + }) + return actions.join(''); + } + + return module; +});