diff --git a/infoport/discussions.html b/infoport/discussions.html new file mode 100644 index 0000000..31f8f24 --- /dev/null +++ b/infoport/discussions.html @@ -0,0 +1,169 @@ + + + + + + 农村资源信息港 + + + + + + + + + +
+ +
+

+ +

+
+
+ +
+ +
+

新闻资讯

+ +
+
+ +
+ +
+

资产信息

+ +
+
+ +
+ +
+

资源信息

+ +
+
+ +
+ +
+

宅基地信息

+ +
+
+ +
+ + +
+

四议两公开

+ +
+
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+
+

四议两公开

+

2023.03.15

+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + + + +
+ + + diff --git a/infoport/discussionsDetail.html b/infoport/discussionsDetail.html new file mode 100644 index 0000000..7be1c41 --- /dev/null +++ b/infoport/discussionsDetail.html @@ -0,0 +1,92 @@ + + + + + + 农村资源信息港 + + + + + + + + + + +
+ +
+
+
+ +

+
+
+

+

+
+
+
+
+
+
+
+
+
四议两公开列表
+
+ +
+
+
+ + + + +
+ + + diff --git a/infoport/homestead.html b/infoport/homestead.html index d1aba78..e812c11 100644 --- a/infoport/homestead.html +++ b/infoport/homestead.html @@ -86,6 +86,14 @@

宅基地信息

+
+ +
+ +
+

四议两公开

+ +
diff --git a/infoport/index.html b/infoport/index.html index cb7f0a6..bfc2bb1 100644 --- a/infoport/index.html +++ b/infoport/index.html @@ -56,6 +56,14 @@

宅基地信息

+
+ +
+ +
+

四议两公开

+ +
diff --git a/infoport/property.html b/infoport/property.html index c3a945f..14b193b 100644 --- a/infoport/property.html +++ b/infoport/property.html @@ -88,6 +88,14 @@

宅基地信息

+
+ +
+ +
+

四议两公开

+ +
diff --git a/infoport/resourceNew.html b/infoport/resourceNew.html index 84da4be..4b24743 100644 --- a/infoport/resourceNew.html +++ b/infoport/resourceNew.html @@ -86,6 +86,14 @@

宅基地信息

+
+ +
+ +
+

四议两公开

+ +
diff --git a/infoport/static/css/index.css b/infoport/static/css/index.css index 5bf40ff..97a5760 100644 --- a/infoport/static/css/index.css +++ b/infoport/static/css/index.css @@ -56,6 +56,10 @@ background: url("../images/nav_8.png") no-repeat center; background-size: 100% 100%; } +.active .i5{ + background: url("../images/nav_10.png") no-repeat center; + background-size: 100% 100%; +} .header .active{ position: relative; } @@ -85,6 +89,11 @@ background-size: 100% 100%; transition: all 0.4s ease-in-out; } +.header .header_nav:hover .i5{ + background: url("../images/nav_10.png") no-repeat center; + background-size: 100% 100%; + transition: all 0.4s ease-in-out; +} .header .header_nav{ cursor: pointer; } @@ -126,6 +135,10 @@ background: url("../images/nav_4.png") no-repeat center; background-size: 100% 100%; } +.i5{ + background: url("../images/nav_9.png") no-repeat center; + background-size: 100% 100%; +} .search{ @@ -198,6 +211,10 @@ cursor: pointer; } +.new_list_li a{ + width: 50%; +} + .new_list_li:first-child{ /*margin-top: 2.5vh;*/ diff --git a/infoport/static/images/nav_10.png b/infoport/static/images/nav_10.png new file mode 100644 index 0000000..3229ae0 Binary files /dev/null and b/infoport/static/images/nav_10.png differ diff --git a/infoport/static/images/nav_9.png b/infoport/static/images/nav_9.png new file mode 100644 index 0000000..a610402 Binary files /dev/null and b/infoport/static/images/nav_9.png differ diff --git a/infoport/static/images/news2.jpg b/infoport/static/images/news2.jpg new file mode 100644 index 0000000..55826a7 Binary files /dev/null and b/infoport/static/images/news2.jpg differ diff --git a/infoport/static/js/api/index.js b/infoport/static/js/api/index.js index 5d8aa4a..d42ecff 100644 --- a/infoport/static/js/api/index.js +++ b/infoport/static/js/api/index.js @@ -105,3 +105,7 @@ var webGet = '/open/house/policy/get/' //查询落款 dictType：project_type */ var webDeptType = '/transaction/website/transfer/'//标的物类型查询接口 + +var listSiyigongkai = '/open/villageAffairs/public/siyigongkaiList'//查询四议两公开列表 + +var siyigongkaiDetail = '/open/villageAffairs/public/siyigongkaiDetail'//查询四议两公开列表 diff --git a/infoport/static/js/project/discussions.js b/infoport/static/js/project/discussions.js new file mode 100644 index 0000000..1295a58 --- /dev/null +++ b/infoport/static/js/project/discussions.js @@ -0,0 +1,103 @@ +/** + * Created by Administrator on 2021/4/5. + */ +define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, swiper) { + //数据存储 + var module = { + data: { + //服务器地址 + serverApi:'', + //焦点图数据 + focusList: [], + communicateList: [], + newImgList:[] + }, + }; + var tools = new Tools(); + + module.init = function (page) { + //新闻列表 + tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList , true); + tools.doGet(webList, {}, module.webList , true); + // new Swiper('#bannerFocusNextWrap', { + // paginationClickable: true, + // pagination: '.a2', + // autoplay : 2000, + // loop:true + // }) + + $("#nowDateNYR").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate()); + + }; + + 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); + + 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.webList = function (data) { + if (data.code == 200) { + var content = data.data; + module.data.webList = content; + var webData = template('webData', module.data); + $("#webContent").html(webData); + var titData = template('titData', module.data); + $("#titContent").html(titData); + } + } + + searchChange = function () { + console.log(1111111111); + tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8,openName:$("#searchInput").val()}, module.newsList , true); + } + + function roll(t) { + var ul1 = document.getElementById("newListContent"); + var ul2 = document.getElementById("newListContent2"); + var ulbox = document.getElementById("review_box"); + ul2.innerHTML = ul1.innerHTML; + ulbox.scrollTop = 0; // 开始无滚动时设为0 + var timer = setInterval(rollStart, t); // 设置定时器，参数t用在这为间隔时间（单位毫秒），参数t越小，滚动速度越快 + // 鼠标移入div时暂停滚动 + ulbox.onmouseover = function () { + clearInterval(timer); + } + // 鼠标移出div后继续滚动 + ulbox.onmouseout = function () { + timer = setInterval(rollStart, t); + } + } + + // 开始滚动函数 + function rollStart() { + // 上面声明的DOM对象为局部对象需要再次声明 + var ul1 = document.getElementById("newListContent"); + var ul2 = document.getElementById("newListContent2"); + var ulbox = document.getElementById("review_box"); + // 正常滚动不断给scrollTop的值+1,当滚动高度大于列表内容高度时恢复为0 + console.log(ulbox.scrollTop+'--------'+ul1.scrollHeight) + if (ulbox.scrollTop >= ul1.scrollHeight) { + ulbox.scrollTop = 0; + } else { + ulbox.scrollTop += 1; + } + } + + return module; +}); diff --git a/infoport/static/js/project/discussionsDetail.js b/infoport/static/js/project/discussionsDetail.js new file mode 100644 index 0000000..84be8b1 --- /dev/null +++ b/infoport/static/js/project/discussionsDetail.js @@ -0,0 +1,83 @@ +/** + * 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(siyigongkaiDetail, {id:getQueryVariable('id')}, module.newsDetail , true); + //新闻列表 + tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, 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'; + } + + let arr2 = content.shishiPic.split(','); + $('#shishiPic')[0].innerHTML = '实施公开图片：
'; + for (let i = 0;i < arr2.length; i++){ + $('#shishiPic')[0].innerHTML += ''; + } + + $('#shishiAt')[0].innerHTML = '实施公开日期：'+content.shishiAt; + + $('#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/newBusinessEntities/index.html b/newBusinessEntities/index.html index 3df385a..cbba4ab 100644 --- a/newBusinessEntities/index.html +++ b/newBusinessEntities/index.html @@ -38,7 +38,7 @@
- +

首页 >

@@ -389,14 +389,6 @@
-
-
-

SUPPLY

-

供应信息

-
- 更多 -
-

SERVICE

diff --git a/newBusinessEntities/static/js/project/index.js b/newBusinessEntities/static/js/project/index.js index 4a5e846..b3d7185 100644 --- a/newBusinessEntities/static/js/project/index.js +++ b/newBusinessEntities/static/js/project/index.js @@ -106,9 +106,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa for ( var i = 0 ; i < content.length ; i++ ){ - content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); + // content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -127,7 +127,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -146,7 +146,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -171,7 +171,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].industryClassificationType = secondArray; } console.log(content[i].industryClassificationType) - content[i].masterMap = serverApi + content[i].masterMap ; + content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null') ; } diff --git a/newBusinessEntities/static/js/project/supply/index.js b/newBusinessEntities/static/js/project/supply/index.js index 86748a1..b0eefd5 100644 --- a/newBusinessEntities/static/js/project/supply/index.js +++ b/newBusinessEntities/static/js/project/supply/index.js @@ -55,6 +55,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp }); tools.doGet(dictType + '/supply_demand_unit', {}, module.dictType , true); tools.doGet(productCategories , {}, module.projectList , true); + tools.getWebConfig(); }; module.dictType = function (data) { @@ -93,7 +94,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -112,7 +113,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -130,7 +131,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } module.data.recommendList = content; @@ -189,9 +190,9 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp for ( var i = 0 ; i < content.length ; i++ ){ - content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); + // content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -238,4 +239,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp } return module; -}) \ No newline at end of file +}) diff --git a/newBusinessEntities/static/js/project/train/index.js b/newBusinessEntities/static/js/project/train/index.js index 7d20e0c..ca735cd 100644 --- a/newBusinessEntities/static/js/project/train/index.js +++ b/newBusinessEntities/static/js/project/train/index.js @@ -36,6 +36,8 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp //console.log(res) } }) + + tools.getWebConfig(); }; //新闻列表 @@ -61,7 +63,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp var content = data.data; for ( var i = 0 ; i < content.length ; i++ ){ content[i].trainingType = module.selectDictLabel(module.data.trainingTypeOptions,content[i].trainingType); - content[i].masterMap = serverApi + content[i].masterMap; + content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null'); } module.data.technologyList = content; var technologyData = template('technologyData', module.data); @@ -147,4 +149,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp } return module; -}) \ No newline at end of file +}) diff --git a/newBusinessEntities/view/price/index.html b/newBusinessEntities/view/price/index.html index 0fccc9f..69330e6 100644 --- a/newBusinessEntities/view/price/index.html +++ b/newBusinessEntities/view/price/index.html @@ -78,59 +78,59 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + +
山芋粉大果中果小果小果小果小果小果小果小果玉米小麦大豆水稻梨苹果葡萄大白菜生菜空心菜
指导价格2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g26元/500g1.58元/500g1.21元/500g1.2元/500g6.2元/500g8元/500g9元/500g3.2元/500g3.5元/500g5.1元/500g
最新价格2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g27元/500g1.58元/500g1.2元/500g1.2元/500g6元/500g8元/500g8元/500g3.5元/500g3.8元/500g5元/500g
日均价格2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g2.5/500g25.6元/500g1.6元/500g1.21元/500g1.22元/500g5.94元/500g7.64元/500g7.75元/500g3元/500g4元/500g4.8元/500g
-
+

产品分类

diff --git a/newBusinessEntities/view/train/index.html b/newBusinessEntities/view/train/index.html index f93af56..819dd70 100644 --- a/newBusinessEntities/view/train/index.html +++ b/newBusinessEntities/view/train/index.html @@ -214,8 +214,7 @@ - - + @@ -223,13 +222,13 @@ - + - - - + + +

{{value.title}}{{value.techniqueType}}

{{value.handleTime}}

{{value.seekTitle}}{{value.techniqueType}}
  

发布人  {{value.submitName}}

发布人  {{value.createBy}}

发布时间  {{value.createTime.substr(0,10)}}

答复专家  {{value.handleName}}

答复时间  {{value.handleTime}}

{{value.phone}}

答复专家  {{value.seekName}}

答复时间  {{value.seekDate}}

{{value.seekPhone}}