diff --git a/static/css/bidding/biddingBigData.css b/static/css/bidding/biddingBigData.css index b18d605..760c8fb 100644 --- a/static/css/bidding/biddingBigData.css +++ b/static/css/bidding/biddingBigData.css @@ -165,7 +165,7 @@ .tableList{ width: 100%!important; - height: calc(100vh - 130px - 10vh)!important; + height: calc(100vh - 130px - 15vh)!important; } .tableList table tr:nth-child(odd){ diff --git a/static/js/project/bidding/biddingBigData.js b/static/js/project/bidding/biddingBigData.js index c1f1ed5..5f6cdfe 100644 --- a/static/js/project/bidding/biddingBigData.js +++ b/static/js/project/bidding/biddingBigData.js @@ -7,7 +7,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t data: { projectShowStatus:'', form:{ - deptId:'', + deptId:100, projectNumber:'', projectShowStatus:'', } @@ -18,7 +18,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t module.init = function (page) { //查询交易项目浏览总次数 // tools.doGet(biddingHallList + '/0/10', {}, module.biddingHallList, true); - tools.doGet(biddingList, {deptId:100,projectShowStatus:'正在竞价'}, module.biddingHallList,true); + tools.doGet(biddingList, {deptId:100,projectShowStatus:'等待竞价'}, module.biddingHallList,true); //竞价大厅-滚动 // module.hallRolling(); @@ -154,17 +154,17 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t } goSearch = function(type){ - if (type == 'dept'){ - if ($('#deptLocationContent').val() == '100') { - document.getElementById('secondDept').style.display = 'none'; - } else { - tools.doGet(webDept, { deptId: $('#deptLocationContent').val() }, module.deptSecondLocation, true); - } - } - - console.log($('#secondDept').val() == '') - module.data.form.deptId = $('#secondDept').val() == '' || $('#secondDept').val() == null ? $('#deptLocationContent').val() : $('#secondDept').val(); - module.data.form.projectNumber = $('#deptTypeContent').val(); + // if (type == 'dept'){ + // if ($('#deptLocationContent').val() == '100') { + // document.getElementById('secondDept').style.display = 'none'; + // } else { + // tools.doGet(webDept, { deptId: $('#deptLocationContent').val() }, module.deptSecondLocation, true); + // } + // } + + // console.log($('#secondDept').val() == '') + // module.data.form.deptId = $('#secondDept').val() == '' || $('#secondDept').val() == null ? $('#deptLocationContent').val() : $('#secondDept').val(); + // module.data.form.projectNumber = $('#deptTypeContent').val(); module.data.form.projectShowStatus= module.data.projectShowStatus; tools.doGet(biddingList, module.data.form, module.biddingHallList, true); diff --git a/view/bidding/biddingBigData.html b/view/bidding/biddingBigData.html index 67d7527..6e85548 100644 --- a/view/bidding/biddingBigData.html +++ b/view/bidding/biddingBigData.html @@ -45,15 +45,15 @@ - - +