diff --git a/infoport/discussions.html b/infoport/discussions.html index 31f8f24..3e519e0 100644 --- a/infoport/discussions.html +++ b/infoport/discussions.html @@ -61,48 +61,148 @@ -

四议两公开

+

公示公开

-
- -
+
+ + + +
+ + + + + + + + +
+ +
+
+

财务公开

+

2023.03.15

+
-
-
-
-
- +
+
+
+
+ + -
+ + + -
+ +
-
- {{each webList.botoom3 as value i}} -
-

{{value.contentTitle}}

- {{value.contentValue}} -
- {{/each}} + +
+ +
+ + + +
diff --git a/infoport/discussionsDetail.html b/infoport/discussionsDetail.html index 7be1c41..78ffca1 100644 --- a/infoport/discussionsDetail.html +++ b/infoport/discussionsDetail.html @@ -45,43 +45,51 @@
- + + diff --git a/infoport/discussionsDetail_01.html b/infoport/discussionsDetail_01.html new file mode 100644 index 0000000..c6d401d --- /dev/null +++ b/infoport/discussionsDetail_01.html @@ -0,0 +1,100 @@ + + + + + + 农村资源信息港 + + + + + + + + + + +
+ +
+
+
+ +

+
+
+

+

+
+
+
+
+
+
+
+
+
财务公开列表
+
+ +
+
+
+ + + +
+ + + + + +
+ + +
+ + + diff --git a/infoport/discussionsDetail_02.html b/infoport/discussionsDetail_02.html new file mode 100644 index 0000000..febea92 --- /dev/null +++ b/infoport/discussionsDetail_02.html @@ -0,0 +1,93 @@ + + + + + + 农村资源信息港 + + + + + + + + + + + +
+ +
+
+
+ +

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
合同公开列表
+
+ +
+
+
+ + + + +
+ + + diff --git a/infoport/discussionsDetail_03.html b/infoport/discussionsDetail_03.html new file mode 100644 index 0000000..4b4b2f9 --- /dev/null +++ b/infoport/discussionsDetail_03.html @@ -0,0 +1,100 @@ + + + + + + 农村资源信息港 + + + + + + + + + + +
+ +
+
+
+ +

+
+
+

+

+
+
+
+
+
+
+
+
+
重大事项列表
+
+ +
+
+
+ + + +
+ + + + + +
+ + +
+ + + diff --git a/infoport/homestead.html b/infoport/homestead.html index e812c11..5699ae4 100644 --- a/infoport/homestead.html +++ b/infoport/homestead.html @@ -220,43 +220,51 @@ - + + diff --git a/infoport/homesteadDetail.html b/infoport/homesteadDetail.html index b1fb2a0..e46c689 100644 --- a/infoport/homesteadDetail.html +++ b/infoport/homesteadDetail.html @@ -159,43 +159,51 @@ - + + diff --git a/infoport/index.html b/infoport/index.html index bfc2bb1..ea529e8 100644 --- a/infoport/index.html +++ b/infoport/index.html @@ -117,43 +117,50 @@ - + + + + + diff --git a/infoport/newDetail.html b/infoport/newDetail.html index 6aa83e5..d426d06 100644 --- a/infoport/newDetail.html +++ b/infoport/newDetail.html @@ -43,43 +43,51 @@ - + + diff --git a/infoport/property.html b/infoport/property.html index 14b193b..7867256 100644 --- a/infoport/property.html +++ b/infoport/property.html @@ -204,43 +204,51 @@ - + + diff --git a/infoport/propertyDetail.html b/infoport/propertyDetail.html index 3354dc3..fef4fcc 100644 --- a/infoport/propertyDetail.html +++ b/infoport/propertyDetail.html @@ -140,43 +140,51 @@ - + + diff --git a/infoport/resource.html b/infoport/resource.html index 1ef0097..0cbfe11 100644 --- a/infoport/resource.html +++ b/infoport/resource.html @@ -190,43 +190,51 @@ - + + diff --git a/infoport/resourceDetail.html b/infoport/resourceDetail.html index 88907ea..807dd88 100644 --- a/infoport/resourceDetail.html +++ b/infoport/resourceDetail.html @@ -130,43 +130,51 @@ - + + diff --git a/infoport/resourceNew.html b/infoport/resourceNew.html index 4b24743..acbc7e6 100644 --- a/infoport/resourceNew.html +++ b/infoport/resourceNew.html @@ -198,43 +198,51 @@ - + + diff --git a/infoport/resourceNewDetail.html b/infoport/resourceNewDetail.html index 687cfa6..ce2d096 100644 --- a/infoport/resourceNewDetail.html +++ b/infoport/resourceNewDetail.html @@ -125,43 +125,51 @@ - + + diff --git a/infoport/static/css/index.css b/infoport/static/css/index.css index 97a5760..054ccff 100644 --- a/infoport/static/css/index.css +++ b/infoport/static/css/index.css @@ -168,6 +168,122 @@ /*align-items: center;*/ } +.login_form_main{ + flex: 1; + /*background: linear-gradient(to bottom right, rgb(168, 249, 252), rgb(105, 119, 249));*/ +} +.login_form_main img{ + width: 50%; + margin: 0 auto; + display: block; +} + +.login_from { + width: 50%; + background: #ffffff; + background-size: 100% 100%; + margin: -1PX auto 0; + padding: 1.6vh 50px 3.2vh; + border-radius: 0 0 20PX 20PX; +} +.btn{ + width: 100%; + height: 4vh; + margin:0 auto; + font-size: 16px; + color: #fff; + line-height: 4vh; + text-align: center; + border: none; + background: linear-gradient(to right , #97EDF7 , #2376EC); + border-radius: 5vh; + cursor: pointer; +} +.login_from .flex_block { + margin-bottom: 2vh; + display: flex; + justify-content: space-between; +} + +.login_from .flex_block .flex_input_main { + position: relative; + display: flex; + flex: 1; + align-items: center; + background: #E7F0FF; + border-radius: 62px; + height: 5vh; +} + +.login_from .flex_block .flex_input_main .icon_wrap.user { + background: url('../images/login_icon_1.png') no-repeat; + background-size: 100% 100%; + margin-left: 30px; +} + +.login_from .flex_block .flex_input_main .icon_wrap.password { + background: url('../images/login_icon_2_code.png') no-repeat; + height: 40%; + background-size: 100% 100%; + margin-left: 30px; +} + +.login_from .flex_block .flex_input_main .icon_wrap.valid { + background: url('../images/login_icon_3.png') no-repeat; + background-size: 100% 100%; + margin-left: 30px; +} + +.login_from .flex_block .flex_input_main .icon_wrap { + width: 2.5vh; + height: 2.5vh; +} + +.login_from .flex_block .flex_input_main .input_wrap { + flex: 1; + margin-left: 16px; + padding-right: 30px; +} + +.login_from .flex_block .flex_input_main .input_wrap .ipt { + width: 100%; + height: 4vh; + background: transparent; + font-size: 16px; + color: #3f3d56; +} + +.login_from .flex_block .flex_input_main .showHidden { + width: 32px; + height: 32px; + background: url('../images/login_icon_4.png') no-repeat; + background-size: 100% 100%; + position: absolute; + right: 38px; + cursor: pointer; +} + +.login_from .flex_block .flex_input_main .showHidden.ico_hide { + background: url('../images/login_icon_5.png') no-repeat; + background-size: 100% 100%; +} + +.login_from .flex_block .flex_input_main.valid { + flex: 0 0 380px; +} + +.login_from .flex_block .valid_main { + width: 165px; + height: 62px; + border-radius: 30px; +} + +.login_from .flex_block .valid_main img { + width: 100%; + height: 100%; + border-radius: 30px; +} + .personalTit-banner { width: 45%; height: 100%; @@ -248,15 +364,26 @@ color: #848484; flex-shrink: 0; } - -.footer{ +.footer_main{ height: 20vh; background: #e1e4ef; margin-top: 6.3vh; + display: flex; + padding: 1.5vh 12.5%; + align-items: center; +} + +#ewm{ + width: 15vh; + height: 15vh; +} + +.footer{ display: flex; flex-direction: column; justify-content: space-between; - padding: 1.5vh 12.5%; + height: 17vh; + flex: 1; } .footer_link_tit{ @@ -430,3 +557,17 @@ background-position: 1000px 0; } } + +.tab_box{ + display: flex; + flex-wrap: wrap; + width: 50%; + justify-content: space-between; + align-items: center; +} + +.tab_box img{ + display: block; + width: 48%; + cursor: pointer; +} diff --git a/infoport/static/css/property.css b/infoport/static/css/property.css index 99a5e0c..5851c3a 100644 --- a/infoport/static/css/property.css +++ b/infoport/static/css/property.css @@ -6,6 +6,9 @@ padding: 1vh; } .footer{ + /*margin-top: 4.3vh;*/ +} +.footer_main{ margin-top: 4.3vh; } @@ -196,4 +199,4 @@ .center_table table tr:first-child td{ background: #e4edfe; -} \ No newline at end of file +} diff --git a/infoport/static/images/index_code_btn_1.png b/infoport/static/images/index_code_btn_1.png new file mode 100644 index 0000000..b997010 Binary files /dev/null and b/infoport/static/images/index_code_btn_1.png differ diff --git a/infoport/static/images/index_code_btn_2.png b/infoport/static/images/index_code_btn_2.png new file mode 100644 index 0000000..29b479e Binary files /dev/null and b/infoport/static/images/index_code_btn_2.png differ diff --git a/infoport/static/images/index_code_btn_3.png b/infoport/static/images/index_code_btn_3.png new file mode 100644 index 0000000..3e0577a Binary files /dev/null and b/infoport/static/images/index_code_btn_3.png differ diff --git a/infoport/static/images/index_code_btn_4.png b/infoport/static/images/index_code_btn_4.png new file mode 100644 index 0000000..524d503 Binary files /dev/null and b/infoport/static/images/index_code_btn_4.png differ diff --git a/infoport/static/images/index_code_btn_5.png b/infoport/static/images/index_code_btn_5.png new file mode 100644 index 0000000..5a6e09c Binary files /dev/null and b/infoport/static/images/index_code_btn_5.png differ diff --git a/infoport/static/images/index_code_btn_6.png b/infoport/static/images/index_code_btn_6.png new file mode 100644 index 0000000..2212742 Binary files /dev/null and b/infoport/static/images/index_code_btn_6.png differ diff --git a/infoport/static/images/login_icon_1.png b/infoport/static/images/login_icon_1.png new file mode 100644 index 0000000..b7f37a0 Binary files /dev/null and b/infoport/static/images/login_icon_1.png differ diff --git a/infoport/static/images/login_icon_2.png b/infoport/static/images/login_icon_2.png new file mode 100644 index 0000000..ae3de19 Binary files /dev/null and b/infoport/static/images/login_icon_2.png differ diff --git a/infoport/static/images/login_icon_2_code.png b/infoport/static/images/login_icon_2_code.png new file mode 100644 index 0000000..eb06ef0 Binary files /dev/null and b/infoport/static/images/login_icon_2_code.png differ diff --git a/infoport/static/images/login_icon_3.png b/infoport/static/images/login_icon_3.png new file mode 100644 index 0000000..ba59e3b Binary files /dev/null and b/infoport/static/images/login_icon_3.png differ diff --git a/infoport/static/images/login_icon_4.png b/infoport/static/images/login_icon_4.png new file mode 100644 index 0000000..f5d4b5d Binary files /dev/null and b/infoport/static/images/login_icon_4.png differ diff --git a/infoport/static/images/login_icon_5.png b/infoport/static/images/login_icon_5.png new file mode 100644 index 0000000..9117514 Binary files /dev/null and b/infoport/static/images/login_icon_5.png differ diff --git a/infoport/static/images/sunVillage_info_login_code_header.png b/infoport/static/images/sunVillage_info_login_code_header.png new file mode 100644 index 0000000..34b6c60 Binary files /dev/null and b/infoport/static/images/sunVillage_info_login_code_header.png differ diff --git a/infoport/static/js/api/index.js b/infoport/static/js/api/index.js index d42ecff..6115950 100644 --- a/infoport/static/js/api/index.js +++ b/infoport/static/js/api/index.js @@ -109,3 +109,17 @@ var webDeptType = '/transaction/website/transfer/'//标的物类型查询接口 var listSiyigongkai = '/open/villageAffairs/public/siyigongkaiList'//查询四议两公开列表 var siyigongkaiDetail = '/open/villageAffairs/public/siyigongkaiDetail'//查询四议两公开列表 + +var checkFarmer = '/register/checkFarmer'//查询四议两公开列表 + +var familyMember = '/open/home/mobile/familyMember/list'//查询四议两公开列表 + +var financePublicList = '/open/villageAffairs/public/financePublicList'//财务公开列表 + +var contractionList = '/open/contraction/list'//合同公开列表 + +var majorEventPublicList = '/open/villageAffairs/public/majorEventPublicList'//重大事项列表 + +var financePublicDetail = '/open/villageAffairs/public/financePublicDetail' + +var majorEventPublicDetail = '/open/villageAffairs/public/majorEventPublicDetail' diff --git a/infoport/static/js/project/discussions.js b/infoport/static/js/project/discussions.js index 1295a58..4fbef49 100644 --- a/infoport/static/js/project/discussions.js +++ b/infoport/static/js/project/discussions.js @@ -17,7 +17,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, module.init = function (page) { //新闻列表 - tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList , true); + tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList4 , true); tools.doGet(webList, {}, module.webList , true); // new Swiper('#bannerFocusNextWrap', { // paginationClickable: true, @@ -25,29 +25,16 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, // autoplay : 2000, // loop:true // }) - - $("#nowDateNYR").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + changeList('1'); }; - module.newsList = function (data) { + module.newsList4 = function (data) { if (data.code == 200) { var content = data.rows; - module.data.newList = content; - var newListData = template('newListData', module.data); - $("#newListContent").html(newListData); - - var newImgList = []; - // content.map(rr=>{ - // if (rr.jueyiPic!=null&&rr.jueyiPic!=""){ - // rr.jueyiPic.split(','); - // newImgList.push(rr.jueyiPic); - // } - // }) - module.data.newImgList = newImgList; - var newListDataImg = template('newListDataImg', module.data); - $("#bannerFocusNextContent").html(newListDataImg); - // roll(20) + module.data.newList4 = content; + var newListData4 = template('newListData4', module.data); + $("#newListContent_ul_4").html(newListData4); } } @@ -59,6 +46,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, $("#webContent").html(webData); var titData = template('titData', module.data); $("#titContent").html(titData); + $('#ewm').attr('src', '/api/'+content.top.bz); } } @@ -67,6 +55,128 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8,openName:$("#searchInput").val()}, module.newsList , true); } + submitUser = function () { + + tools.doPost(checkFarmer, {memberName:$("#userName").val(),idcard:$("#password").val()}, module.checkFarmer , true); + + } + + module.checkFarmer = function (data) { + if (data.code == 200) { + let seconds = 3600; + let expires = new Date(new Date() * 1 + seconds * 1000); + tools.setCookie("user", JSON.stringify(data.data), { expires: expires }); + + tools.doGet(familyMember, {idcard:$("#password").val(),familyStatus:"02"}, module.familyMember , true); + + } + } + + module.familyMember = function (data) { + if (data.code == 200) { + const farmerCode = data.rows[0].farmerCode; + tools.setCookie("farmerCode",farmerCode, { expires: 30 }); + $('#loginF').css('display','none'); + $('#new_list').css('display','block'); + } + } + + changeList = function (type) { + $('#new_list_1').css('display','none'); + $('#new_list_2').css('display','none'); + $('#new_list_3').css('display','none'); + $('#new_list_4').css('display','none'); + $('#new_list_5').css('display','none'); + $('#new_list_6').css('display','none'); + switch (type) { + + case '1': + $('#new_list_1').css('display','block'); + $("#nowDateNYR1").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(financePublicList, { + pageNum:1, + pageSize:10, + orderByColumn: 'openNy', + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsList1 , true); + break; + + case '2': + $('#new_list_2').css('display','block'); + $("#nowDateNYR2").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(contractionList, { + pageNum:1, + pageSize:10, + orderByColumn: 'buildingTime', + translate_dict: 1, + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsList2 , true); + break; + + case '3': + $('#new_list_3').css('display','block'); + $("#nowDateNYR3").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(majorEventPublicList, { + pageNum:1, + pageSize:10, + orderByColumn: 'openNy', + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsList3 , true); + break; + + case '4': + $('#new_list_4').css('display','block'); + $("#nowDateNYR4").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList4 , true); + break; + + case '5': + $('#new_list_5').css('display','block'); + $("#nowDateNYR5").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + break; + + case '6': + $('#new_list_6').css('display','block'); + $("#nowDateNYR6").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + break; + + } + + } + + module.newsList1 = function (data) { + if (data.code == 200) { + var content = data.rows; + module.data.newList1 = content; + var newListData1 = template('newListData1', module.data); + $("#newListContent_ul_1").html(newListData1); + } + } + + module.newsList2 = function (data) { + if (data.code == 200) { + var content = data.rows; + module.data.newList2 = content; + var newListData2 = template('newListData2', module.data); + $("#newListContent_ul_2").html(newListData2); + } + } + + module.newsList3 = function (data) { + if (data.code == 200) { + var content = data.rows; + module.data.newList3 = content; + var newListData3 = template('newListData3', module.data); + $("#newListContent_ul_3").html(newListData3); + } + } + function roll(t) { var ul1 = document.getElementById("newListContent"); var ul2 = document.getElementById("newListContent2"); diff --git a/infoport/static/js/project/discussionsDetail_01.js b/infoport/static/js/project/discussionsDetail_01.js new file mode 100644 index 0000000..5a5e6c7 --- /dev/null +++ b/infoport/static/js/project/discussionsDetail_01.js @@ -0,0 +1,95 @@ +/** + * 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(financePublicDetail, { + id:getQueryVariable('id'), + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsDetail , true); + //新闻列表 + tools.doGet(financePublicList, { + pageNum:1, + pageSize:10, + orderByColumn: 'openNy', + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, 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'; + } + } + + $('#shishiPic')[0].innerHTML = '附件：
'; + + if (content.openFile){ + let arr2 = content.openFile.split(','); + for (let i = 0;i < arr2.length; i++){ + $('#shishiPic')[0].innerHTML += ''; + } + } + + $('#remark')[0].innerHTML = '备注：'+content.remark; + + } + } + + 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; +}); diff --git a/infoport/static/js/project/discussionsDetail_02.js b/infoport/static/js/project/discussionsDetail_02.js new file mode 100644 index 0000000..57225cc --- /dev/null +++ b/infoport/static/js/project/discussionsDetail_02.js @@ -0,0 +1,85 @@ +/** + * 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(contractionList, { + code:getQueryVariable('id'), + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, module.newsDetail , true); + //新闻列表 + tools.doGet(contractionList, { + pageNum:1, + pageSize:10, + orderByColumn: 'buildingTime', + isAsc: 'desc', + bookId: JSON.parse(tools.getCookie('user')).bookId, + deptId: JSON.parse(tools.getCookie('user')).deptId + }, 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 += ''; + } + } + + $('#content')[0].innerHTML = '内容：'+content.content; + $('#remark')[0].innerHTML = '备注：'+content.remark; + + } + } + + 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; +});