| @@ -165,7 +165,7 @@ | |||||
| .tableList{ | .tableList{ | ||||
| width: 100%!important; | width: 100%!important; | ||||
| height: calc(100vh - 130px - 10vh)!important; | |||||
| height: calc(100vh - 130px - 15vh)!important; | |||||
| } | } | ||||
| .tableList table tr:nth-child(odd){ | .tableList table tr:nth-child(odd){ | ||||
| @@ -7,7 +7,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t | |||||
| data: { | data: { | ||||
| projectShowStatus:'', | projectShowStatus:'', | ||||
| form:{ | form:{ | ||||
| deptId:'', | |||||
| deptId:100, | |||||
| projectNumber:'', | projectNumber:'', | ||||
| projectShowStatus:'', | projectShowStatus:'', | ||||
| } | } | ||||
| @@ -18,7 +18,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t | |||||
| module.init = function (page) { | module.init = function (page) { | ||||
| //查询交易项目浏览总次数 | //查询交易项目浏览总次数 | ||||
| // tools.doGet(biddingHallList + '/0/10', {}, module.biddingHallList, true); | // 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(); | // module.hallRolling(); | ||||
| @@ -154,17 +154,17 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t | |||||
| } | } | ||||
| goSearch = function(type){ | 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; | module.data.form.projectShowStatus= module.data.projectShowStatus; | ||||
| tools.doGet(biddingList, module.data.form, module.biddingHallList, true); | tools.doGet(biddingList, module.data.form, module.biddingHallList, true); | ||||
| @@ -45,15 +45,15 @@ | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <!-- <div class="tab_select">--> | |||||
| <!-- <div class="tab_main">--> | |||||
| <div class="tab_select"> | |||||
| <div class="tab_main"> | |||||
| <!-- <div class="tab1 active" id="statusall" onclick="selectedStatus('all','')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | <!-- <div class="tab1 active" id="statusall" onclick="selectedStatus('all','')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | ||||
| <!-- <div class="tab2" id="status1" onclick="selectedStatus('1','正在报名')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | <!-- <div class="tab2" id="status1" onclick="selectedStatus('1','正在报名')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | ||||
| <!-- <div class="tab3" id="status2" onclick="selectedStatus('2','等待竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | |||||
| <!-- <div class="tab4" id="status3" onclick="selectedStatus('3','正在竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | |||||
| <div class="tab3 active" id="status2" onclick="selectedStatus('2','等待竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div> | |||||
| <div class="tab4" id="status3" onclick="selectedStatus('3','正在竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div> | |||||
| <!-- <div class="tab5" id="status4" onclick="selectedStatus('4','等待成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | <!-- <div class="tab5" id="status4" onclick="selectedStatus('4','等待成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | ||||
| <!-- <div class="tab6" id="status5" onclick="selectedStatus('5','已经成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | <!-- <div class="tab6" id="status5" onclick="selectedStatus('5','已经成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>--> | ||||
| <!-- </div>--> | |||||
| </div> | |||||
| <!-- <div class="select_main">--> | <!-- <div class="select_main">--> | ||||
| <!-- <select name="" id="deptLocationContent" onchange="goSearch('dept')">--> | <!-- <select name="" id="deptLocationContent" onchange="goSearch('dept')">--> | ||||
| @@ -81,7 +81,7 @@ | |||||
| <!-- </script>--> | <!-- </script>--> | ||||
| <!-- </select>--> | <!-- </select>--> | ||||
| <!-- </div>--> | <!-- </div>--> | ||||
| <!-- </div>--> | |||||
| </div> | |||||
| <div class="bidding"> | <div class="bidding"> | ||||
| <table width="100%" class="tableHead" style="table-layout: fixed;" > | <table width="100%" class="tableHead" style="table-layout: fixed;" > | ||||