diff --git a/static/css/listingItems/items.css b/static/css/listingItems/items.css
index 7c7f03c..bee214a 100644
--- a/static/css/listingItems/items.css
+++ b/static/css/listingItems/items.css
@@ -516,3 +516,11 @@
font-weight: bold;
text-align: center;
}
+
+.centerLeft-center-middle{
+ margin-right: 60px;
+}
+
+.centerLeft-center-middle:nth-child(4n){
+ margin-right: 0px;
+}
\ No newline at end of file
diff --git a/static/css/new/new.css b/static/css/new/new.css
index 234f4f6..19e9991 100644
--- a/static/css/new/new.css
+++ b/static/css/new/new.css
@@ -77,36 +77,6 @@
text-align: center;
}
-.pageNum li{
- width: 25px;
- height: 25px;
- text-align: center;
- line-height: 25px;
- margin-right: 5px;
- display: inline-block;
-}
-
-.pageNum p{
- height: 25px;
- text-align: center;
- line-height: 25px;
- margin-right: 5px;
- display: inline-block;
-}
-
-.pageNum li.active{
- background-color: #007b76;
- color: #ffffff;
- border-radius: 2px;
-}
-
-.pageNum li:hover{
- background-color: #007b76;
- color: #ffffff;
- border-radius: 2px;
- cursor:pointer;
-}
-
.title{
text-align: center;
margin-top: 80px;
diff --git a/static/css/page_common.css b/static/css/page_common.css
new file mode 100644
index 0000000..064eca0
--- /dev/null
+++ b/static/css/page_common.css
@@ -0,0 +1,52 @@
+.iconfont {
+ font-size:16px;
+}
+
+.icon-you:before {
+ content: ">";
+}
+
+.icon-zuo:before {
+ content: "<";
+}
+
+.icon-most-left:before {
+ content: "<<";
+}
+
+.icon-most-right:before {
+ content: ">>";
+}
+
+.page_common_btn_style{
+ font-family: '微软雅黑';
+ display: inline-block;
+ min-width: 28px;
+ padding:0 2px;
+ height: 30px;
+ line-height: 30px;
+ text-align: center;
+ border-radius: 5px;
+ background: #f4f4f5;
+ color: #606266;
+ margin: 0 3px;
+ font-weight: 600;
+ font-size:14px;
+ cursor: pointer;
+ -webkit-tap-highlight-color: transparent;
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+}
+a.page_common_btn_style:active{
+ color:#007b76;
+ background:#eee;
+}
+
+.page_btn_box {
+ display: inline-block;
+ margin: 0 10px;
+}
+.page_common_btn_active{
+ background:#007b76;
+ color:#eee;
+}
\ No newline at end of file
diff --git a/static/js/api/announcementList.js b/static/js/api/announcementList.js
new file mode 100644
index 0000000..7a793c3
--- /dev/null
+++ b/static/js/api/announcementList.js
@@ -0,0 +1,10 @@
+/*--------------
+* 项目公告类
+-----------------*/
+
+/*
+@purl /transaction/website/outproject/publicity/{deptId}
+@param
+ deptId：行政区划部门ID
+*/
+var announList = '/transaction/website/outproject/publicity'
diff --git a/static/js/api/bidding.js b/static/js/api/bidding.js
new file mode 100644
index 0000000..10026b8
--- /dev/null
+++ b/static/js/api/bidding.js
@@ -0,0 +1,25 @@
+/*--------------
+* 竞价大厅类
+-----------------*/
+
+/*
+@purl /transaction/website/biddinglist/{deptId}
+@param
+ deptId：行政区划部门ID
+*/
+var biddingList = '/transaction/website/biddinglist'
+
+/*
+@purl /system/dict/data/type/ + dictType
+@param
+ dictType：project_type
+*/
+var webDeptType = '/transaction/website/data/type'//标的物类型查询接口
+
+/*
+@purl /transaction/website/deptList/{deptId}
+@param
+ deptId：查询当前平台级别下一级的部门列表 传参 0
+ 查询某一级别下一级的部门列表 传参网址url中的deptId
+*/
+var webDept = '/transaction/website/deptList'//标的物所在地
diff --git a/static/js/api/items.js b/static/js/api/items.js
new file mode 100644
index 0000000..fc8b02a
--- /dev/null
+++ b/static/js/api/items.js
@@ -0,0 +1,29 @@
+/*--------------
+* 挂牌项目类
+-----------------*/
+
+/*
+@purl /transaction/website/outproject/list
+@param
+ deptId：行政区划部门ID
+ projectCode：项目编号
+ projectName：项目名称
+ projectNumber：项目类型字典value值(下拉框选择)
+
+*/
+var itemsList = '/transaction/website/outproject/list'
+
+/*
+@purl /system/dict/data/type/ + dictType
+@param
+ dictType：project_type
+*/
+var webDeptType = '/transaction/website/data/type'//标的物类型查询接口
+
+/*
+@purl /transaction/website/deptList/{deptId}
+@param
+ deptId：查询当前平台级别下一级的部门列表 传参 0
+ 查询某一级别下一级的部门列表 传参网址url中的deptId
+*/
+var webDept = '/transaction/website/deptList'//标的物所在地
diff --git a/static/js/common/main.js b/static/js/common/main.js
index 6712142..082ff43 100644
--- a/static/js/common/main.js
+++ b/static/js/common/main.js
@@ -17,11 +17,15 @@ requirejs.config({
nprogress: 'lib/nprogress/nprogress', //页面加载loading组件
echarts: 'lib/echarts/echarts.min', //echarts组件
laydata:'lib/laydata/laydata',
+ paging:'lib/paging/page_common',
//自己写的路径配置
Tools: 'common/tools',
addressApi: 'api/index', //所有Ajax接口存放地
- newApi: 'api/new' //新闻接口
+ newApi: 'api/new', //新闻接口
+ itemsApi: 'api/items', //挂牌项目接口
+ biddingApi: 'api/bidding', //竞价大厅接口
+ announApi: 'api/announcementList', //项目公告接口
},
shim: {
bootstrap: {
@@ -41,6 +45,10 @@ requirejs.config({
nprogress: {
deps: ['jquery'],
exports: 'nprogress'
+ },
+ paging: {
+ deps: ['jquery'],
+ exports: 'paging'
}
}
});
diff --git a/static/js/lib/paging/page_common.js b/static/js/lib/paging/page_common.js
new file mode 100644
index 0000000..7688f41
--- /dev/null
+++ b/static/js/lib/paging/page_common.js
@@ -0,0 +1,225 @@
+// 初始化分页
+function createPage(el) {
+ var element = $(el)
+ // 创建回到顶部
+ element.append('')
+ // 添加图标
+ $(el + ' .prev_top_btn').append('')
+ // 创建上一步按钮
+ element.append('')
+ // 添加图标
+ $(el + ' .prev_btn').append('')
+ // 创建页码按钮框
+ element.append('')
+ // 创建下一步按钮
+ element.append('')
+ // 添加图标
+ $(el + ' .next_btn').append('')
+ // 创建跳到最后一页按钮
+ element.append('')
+ // 添加图标
+ $(el + ' .next_bottom_btn').append('')
+ // 返回 el
+ return {
+ el: el, //选择器
+ html: $(el).html(), //htnl 内容
+ }
+}
+
+// 设置分页
+function setPage(dom, pageData) {
+ var pageData=pageData;
+ if(pageData==undefined){
+ pageData={};
+ }
+ // el = dom 选择器 例如：'.class' / '#id'
+ // pageData = 分页配置
+
+ if(pageData.maxBtnNum<5||pageData.maxBtnNum==undefined){
+ pageData.maxBtnNum=5;
+ }
+
+ if(pageData.pageCurrent==undefined){
+ pageData.pageCurrent=1;
+ }
+
+ if(pageData.pageSize==undefined){
+ pageData.pageSize=10;
+ }
+
+ if(pageData.pageTotal==undefined){
+ pageData.pageTotal=0;
+ }
+
+ // 初始化设置分页 (防止多次使用配置函数出现错误)
+ $(dom.el).html(dom.html)
+
+
+ // 获取需要多少个按钮
+ var btnSum; // sum
+ if (pageData.pageTotal < pageData.pageSize) {
+ btnSum = 1;
+ } else if (pageData.pageTotal % pageData.pageSize === 0) {
+ btnSum = pageData.pageTotal / pageData.pageSize;
+ } else {
+ btnSum = parseInt(pageData.pageTotal / pageData.pageSize) + 1;
+ }
+
+ // 设置当前页
+ var Current=pageData.pageCurrent; //当前页
+ if(Current<=0){
+ Current=1;
+ }else if(Current>btnSum){
+ Current=btnSum;
+ }
+
+ // 生成分页按钮函数
+ function createBtnItem(pageCurrent){
+ var _len;
+ if (pageData.maxBtnNum >= btnSum) {
+ // 最大按钮数刚好等于 有多少页时 无需隐藏其他按钮
+ _len=btnSum;
+ } else {
+ // 最大按钮数大于 有多少页时 需要隐藏其他按钮
+ _len=pageData.maxBtnNum;
+ }
+ // 设置分页显示段
+ var minPageNum,maxPageNum;
+ minPageNum=pageCurrent-parseInt(_len/2);
+ maxPageNum=pageCurrent+parseInt(_len/2);
+
+ if(_len%2===0){
+ maxPageNum--
+ }
+
+ if(minPageNum<1){
+ maxPageNum+= 1-minPageNum;
+ minPageNum=1;
+ }
+
+ if(maxPageNum>btnSum){
+ minPageNum-=maxPageNum-btnSum;
+ maxPageNum=btnSum;
+ }
+
+
+ var html_S='',content_html='';
+
+ // 生成按钮
+ for(var i=minPageNum;i'+i+'';
+ }else{
+ html_S=''+i+'';
+ }
+ if(i==minPageNum&&minPageNum!=1){
+ html_S='···'
+ }
+ if(i==maxPageNum&&maxPageNum!=btnSum){
+ html_S='···'
+ }
+ content_html+=html_S;
+ }
+ $(dom.el+' .page_btn_box').html(content_html)
+ }
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+
+ // 分页切换按钮事件
+ $(dom.el+' .page_btn_box').on('click','a.page_common_btn_style',function(){
+ Current=parseInt($(this).attr('data-pageIndex'));
+
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+ })
+
+ // 上一页事件
+ $(dom.el).on('click','a.prev_btn',function(){
+ if(Current<=1){
+ return;
+ }
+ Current-=1;
+
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+ turnThePage(Current)
+ })
+
+ // 回到首页事件
+ $(dom.el).on('click','a.prev_top_btn',function(){
+ if(Current<=1){
+ return;
+ }
+ Current=1;
+
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+ turnThePage(Current)
+ })
+
+ // 下一页事件
+ $(dom.el).on('click','a.next_btn',function(){
+ if(Current>=btnSum){
+ return;
+ }
+ Current+=1;
+
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+ turnThePage(Current)
+ })
+
+ // 跳至尾页事件
+ // 回到首页事件
+ $(dom.el).on('click','a.next_bottom_btn',function(){
+ if(Current>=btnSum){
+ return;
+ }
+ Current=btnSum;
+
+ createBtnItem(Current);
+ //
+ setUpbtnState(dom.el,Current)
+ turnThePage(Current)
+ })
+
+ // 处理公共上一步下一步状态
+ function setUpbtnState(dom_s,num){
+ var css_s={
+ 'color':'#b2b2b2',
+ 'opacity':'0.6',
+ }
+ var none_css={
+ 'color':'#606266',
+ 'opacity':'1',
+ }
+ if(num<=1){
+ setCssStyle(1,css_s)
+ setCssStyle(2,none_css)
+ }else if(num>=btnSum){
+ setCssStyle(2,css_s)
+ setCssStyle(1,none_css)
+ }else{
+ setCssStyle(1,none_css)
+ setCssStyle(2,none_css)
+ }
+
+ //
+ function setCssStyle(type,_cssObject){
+ if(type==1){
+ // 上
+ $(dom_s+' .prev_top_btn').css(_cssObject)
+ $(dom_s+' .prev_btn').css(_cssObject)
+ }else{
+ // 下
+ $(dom_s+' .next_btn').css(_cssObject)
+ $(dom_s+' .next_bottom_btn').css(_cssObject)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/static/js/project/announcementList/announcementList.js b/static/js/project/announcementList/announcementList.js
new file mode 100644
index 0000000..07697dc
--- /dev/null
+++ b/static/js/project/announcementList/announcementList.js
@@ -0,0 +1,64 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "announApi", "paging"], function ($, template, Tools ) {
+ //数据存储
+ var module = {
+ data: {
+ //公告列表
+ announInformationList:'',
+ //页码
+ pageNum: 1,
+ //页码集合
+ pageList: [],
+ //每页数量
+ pageSize: 50,
+ //总页数
+ pageCount:0
+ },
+ };
+ var tools = new Tools();
+
+ module.init = function (page) {
+
+ //新闻资讯
+ tools.doGet(announList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.announInformation);
+
+
+ };
+
+ //项目公告数据
+ module.announInformation = function (data) {
+ console.log(data)
+ if (data.code == 200) {
+ console.log(data)
+ var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.announInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s1');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.total, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 （最少5个）
+ })
+ $('#page_s1').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
+ module.data.announInformationList = content;
+ var announInformationData = template('announInformationData', module.data);
+ $("#announInformationContent").html(announInformationData);
+ }
+ }
+
+ turnThePage = function (pageNum) {
+ module.data.pageNum = pageNum ;
+ tools.doGet(announList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.announInformation);
+ }
+ return module;
+});
\ No newline at end of file
diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js
new file mode 100644
index 0000000..d71f138
--- /dev/null
+++ b/static/js/project/bidding/biddingList.js
@@ -0,0 +1,99 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, template, Tools ) {
+ //数据存储
+ var module = {
+ data: {
+ //标的物类型
+ deptTypeList:[],
+ //标的物所在地
+ deptLocationList:[],
+ //竞价大厅列表
+ biddingInformationList:'',
+ //页码
+ pageNum: 1,
+ //页码集合
+ pageList: [],
+ //每页数量
+ pageSize: 50,
+ //总页数
+ pageCount:0
+ },
+ };
+ var tools = new Tools();
+
+ module.init = function (page) {
+
+ //新闻资讯
+ tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.biddingList);
+
+ //标的物类型
+ tools.doGet(webDeptType+"/project_type", {}, module.deptType);
+
+ //标的物所在地
+ tools.doGet(webDept + '/0', {}, module.deptLocation);
+ };
+
+ //挂牌项目列表
+ module.biddingList = function (data) {
+ if (data.code == 200) {
+ console.log(data)
+ var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.biddingInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s1');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.total, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 （最少5个）
+ })
+ $('#page_s1').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
+ module.data.biddingInformationList = content;
+ var biddingInformationData = template('biddingInformationData', module.data);
+ $("#biddingInformationContent").html(biddingInformationData);
+ }
+ }
+
+ //标的物类型
+ module.deptType = function (data) {
+ console.log(data)
+ if (data.code == 200) {
+ var content = [] ;
+ console.log(data.data)
+ for (var i = 0 ; i < 4 ; i++){
+ content[i] = data.data[i];
+ }
+ module.data.deptTypeList = content;
+ var deptTypeData = template('deptTypeData', module.data);
+ $("#deptTypeContent").html(deptTypeData);
+ }
+ }
+
+ //标的物所在地
+ module.deptLocation = function (data) {
+ if (data.code == 200) {
+ var content = [] ;
+ for (var i = 0 ; i < 7 ; i++){
+ content[i] = data.data[i];
+ }
+ module.data.deptLocationList = content;
+ var deptLocationData = template('deptLocationData', module.data);
+ $("#deptLocationContent").html(deptLocationData);
+ }
+ }
+
+ turnThePage = function (pageNum) {
+ module.data.pageNum = pageNum ;
+ tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+ }
+ return module;
+});
\ No newline at end of file
diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js
new file mode 100644
index 0000000..c77c644
--- /dev/null
+++ b/static/js/project/listingItems/itemsList.js
@@ -0,0 +1,101 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, template, Tools ) {
+ //数据存储
+ var module = {
+ data: {
+ //服务器地址
+ serverApi:'http://192.168.31.107:8080',
+ //标的物类型
+ deptTypeList:[],
+ //标的物所在地
+ deptLocationList:[],
+ //新闻列表
+ itemsInformationList:'',
+ //页码
+ pageNum: 1,
+ //页码集合
+ pageList: [],
+ //每页数量
+ pageSize: 50,
+ //总页数
+ pageCount:0
+ },
+ };
+ var tools = new Tools();
+
+ module.init = function (page) {
+
+ //新闻资讯
+ tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+
+ //标的物类型
+ tools.doGet(webDeptType+"/project_type", {}, module.deptType);
+
+ //标的物所在地
+ tools.doGet(webDept + '/0', {}, module.deptLocation);
+ };
+
+ //挂牌项目列表
+ module.itemList = function (data) {
+ if (data.code == 200) {
+ console.log(data)
+ var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.itemsInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s1');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.total, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 （最少5个）
+ })
+ $('#page_s1').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
+ module.data.itemsInformationList = content;
+ var ItemsInformationData = template('ItemsInformationData', module.data);
+ $("#ItemsInformationContent").html(ItemsInformationData);
+ }
+ }
+
+ //标的物类型
+ module.deptType = function (data) {
+ console.log(data)
+ if (data.code == 200) {
+ var content = [] ;
+ console.log(data.data)
+ for (var i = 0 ; i < 4 ; i++){
+ content[i] = data.data[i];
+ }
+ module.data.deptTypeList = content;
+ var deptTypeData = template('deptTypeData', module.data);
+ $("#deptTypeContent").html(deptTypeData);
+ }
+ }
+
+ //标的物所在地
+ module.deptLocation = function (data) {
+ if (data.code == 200) {
+ var content = [] ;
+ for (var i = 0 ; i < 7 ; i++){
+ content[i] = data.data[i];
+ }
+ module.data.deptLocationList = content;
+ var deptLocationData = template('deptLocationData', module.data);
+ $("#deptLocationContent").html(deptLocationData);
+ }
+ }
+
+ turnThePage = function (pageNum) {
+ module.data.pageNum = pageNum ;
+ tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+ }
+ return module;
+});
\ No newline at end of file
diff --git a/static/js/project/new/new.js b/static/js/project/new/new.js
index 703cffd..2bc0cda 100644
--- a/static/js/project/new/new.js
+++ b/static/js/project/new/new.js
@@ -1,7 +1,7 @@
/**
* Created by Administrator on 2021/4/5.
*/
-define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools ) {
+define(['jquery', "template", "Tools", "newApi", "paging"], function ($, template, Tools ) {
//数据存储
var module = {
data: {
@@ -9,10 +9,12 @@ define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools )
newsInformationList:'',
//页码
pageNum: 1,
- //总页数
- pageList: 0,
+ //页码集合
+ pageList: [],
//每页数量
- pageSize: 1,
+ pageSize: 50,
+ //总页数
+ pageCount:0
},
};
var tools = new Tools();
@@ -20,21 +22,41 @@ define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools )
module.init = function (page) {
//新闻资讯
- tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:1}, module.NewsInformation);
+ tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation);
+
};
//新闻资讯数据
module.NewsInformation = function (data) {
- console.log(data)
if (data.code == 200) {
var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.newsInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s1');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.total, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 （最少5个）
+ })
+ $('#page_s1').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
module.data.newsInformationList = content;
var NewsInformationData = template('NewsInformationData', module.data);
$("#NewsInformationContent").html(NewsInformationData);
- module.data.pageList = data.total/module.data.pageSize;
}
}
+ turnThePage = function (pageNum) {
+ module.data.pageNum = pageNum ;
+ tools.doGet(newList, {number:2,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.NewsInformation);
+ }
return module;
});
\ No newline at end of file
diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html
index bba6f67..9d49e96 100644
--- a/view/announcement/announcement.html
+++ b/view/announcement/announcement.html
@@ -14,6 +14,7 @@
+
@@ -60,12 +61,12 @@
@@ -76,68 +77,22 @@
+
-
- - 1
- - 2
- - 3
- - 4
- - 5
- ...
- - 10
- >>
- 共10页
-
@@ -166,5 +121,6 @@
-
+