Commit 54681fb2 authored by danfuman's avatar danfuman

修改

parent a0a245aa
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
return { return {
loading: false, // 是否加载完成-当前页控制 loading: false, // 是否加载完成-当前页控制
iframeTimer: '', // 是否加载中定时器-当前页控制 iframeTimer: '', // 是否加载中定时器-当前页控制
footHeight: 0, //底部高度,若为0(页面内部嵌套或者没有底部板块)
iframeHight: window.innerHeight, // iframe高度-当前页控制 iframeHight: window.innerHeight, // iframe高度-当前页控制
navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68}, // iframe之外页面顶部对象,ifFixed:是否浮动;fixedHeight:浮动对象高度;totalHeight:顶部整体高度 navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68}, // iframe之外页面顶部对象,ifFixed:是否浮动;fixedHeight:浮动对象高度;totalHeight:顶部整体高度
src: '', //iframe嵌套页面地址 src: '', //iframe嵌套页面地址
...@@ -34,11 +35,11 @@ ...@@ -34,11 +35,11 @@
}, },
mounted() { mounted() {
this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制 this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制
steerScroll('companyIframe', this.navigation, true) // 监听滚动(iframe的id、页面排除iframe后页面剩下顶部高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]] steerScroll('companyIframe', this.navigation, this.footHeight, true) // iframeId: iframe的id;navigation:页面排除iframe后剩下的顶部高度;footHeight: 页面排除iframe后剩下的底部高度;state:监听or移除监听;parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例(可忽略
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this.iframeTimer) // -当前页控制 clearInterval(this.iframeTimer) // -当前页控制
steerScroll('companyIframe', this.navigation) // 销毁滚动 steerScroll('companyIframe', this.navigation, this.footHeight) // iframeId: iframe的id;navigation:页面排除iframe后剩下的顶部高度;footHeight: 页面排除iframe后剩下的底部高度;state:监听or移除监听;parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例(可忽略)
clearInterval(this.tokentimer) clearInterval(this.tokentimer)
}, },
methods: { methods: {
......
...@@ -40,20 +40,36 @@ ...@@ -40,20 +40,36 @@
<el-table-column prop="major" label="资质类型"/> <el-table-column prop="major" label="资质类型"/>
<el-table-column label="特级" align="right"> <el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量(个)" align="right"/> <el-table-column prop="tjCount" label="数量" align="right">
<el-table-column prop="tjRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.tjCount }}</template>
</el-table-column>
<el-table-column prop="tjRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.tjRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="一级" align="right"> <el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量(个)" align="right"/> <el-table-column prop="oneCount" label="数量" align="right">
<el-table-column prop="oneRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.oneCount }}</template>
</el-table-column>
<el-table-column prop="oneRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.oneRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="二级" align="right"> <el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量(个)" align="right"/> <el-table-column prop="twoCount" label="数量" align="right">
<el-table-column prop="twoRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.twoCount }}</template>
</el-table-column>
<el-table-column prop="twoRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.twoRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="三级" align="right"> <el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量(个)" align="right"/> <el-table-column prop="threeCount" label="数量" align="right">
<el-table-column prop="threeRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.threeCount }}</template>
</el-table-column>
<el-table-column prop="threeRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.threeRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -85,20 +101,36 @@ ...@@ -85,20 +101,36 @@
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区"/> <el-table-column prop="province" label="地区"/>
<el-table-column label="特级" align="right"> <el-table-column label="特级" align="right">
<el-table-column prop="tjCount" label="数量(个)" align="right"/> <el-table-column prop="tjCount" label="数量" align="right">
<el-table-column prop="tjRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.tjCount }}</template>
</el-table-column>
<el-table-column prop="tjRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.tjRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="一级" align="right"> <el-table-column label="一级" align="right">
<el-table-column prop="oneCount" label="数量(个)" align="right"/> <el-table-column prop="oneCount" label="数量" align="right">
<el-table-column prop="oneRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.oneCount }}</template>
</el-table-column>
<el-table-column prop="oneRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.oneRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="二级" align="right"> <el-table-column label="二级" align="right">
<el-table-column prop="twoCount" label="数量(个)" align="right"/> <el-table-column prop="twoCount" label="数量" align="right">
<el-table-column prop="twoRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.twoCount }}</template>
</el-table-column>
<el-table-column prop="twoRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.twoRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="三级" align="right"> <el-table-column label="三级" align="right">
<el-table-column prop="threeCount" label="数量(个)" align="right"/> <el-table-column prop="threeCount" label="数量" align="right">
<el-table-column prop="threeRate" label="占比(%)" align="right"/> <template slot-scope="scope">{{ scope.row.threeCount }}</template>
</el-table-column>
<el-table-column prop="threeRate" label="占比" align="right">
<template slot-scope="scope">{{ scope.row.threeRate }}%</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -127,7 +159,9 @@ ...@@ -127,7 +159,9 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" /> <el-table-column prop="province" label="地区" />
<el-table-column prop="count" label="企业异地备案数量(个)" sortable align="right"/> <el-table-column prop="count" label="企业异地备案数量" sortable align="right">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<!--<el-table-column prop="zb" label="占比"/>--> <!--<el-table-column prop="zb" label="占比"/>-->
</el-table> </el-table>
</div> </div>
......
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
getYears(){ getYears(){
getYears({}).then(res => { getYears({}).then(res => {
this.yearOptions=res.data.reverse(); this.yearOptions=res.data.reverse();
this.queryParams.year=this.yearOptions[0].year
}) })
}, },
//地区 //地区
......
...@@ -31,8 +31,12 @@ ...@@ -31,8 +31,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100"/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -70,8 +74,12 @@ ...@@ -70,8 +74,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100"/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -112,8 +120,12 @@ ...@@ -112,8 +120,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus"/> <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100"/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -147,8 +159,12 @@ ...@@ -147,8 +159,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="年份" :formatter="formatStatus"/> <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100"/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -789,6 +805,9 @@ export default { ...@@ -789,6 +805,9 @@ export default {
width: 33%; width: 33%;
float: right; float: right;
::v-deep .el-table{ ::v-deep .el-table{
.caret-wrapper{
width: 13px;
}
.sort-caret.ascending{ .sort-caret.ascending{
border-bottom-color: rgba(0,129,255,0.5); border-bottom-color: rgba(0,129,255,0.5);
} }
......
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="年份" :formatter="formatStatus"/> <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量(个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="招标数量" align="right" :formatter="formatStatus" sortable>
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -63,8 +65,12 @@ ...@@ -63,8 +65,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus"/> <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="招标数量" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100" /> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="100">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -101,8 +107,12 @@ ...@@ -101,8 +107,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="label" label="时间" :formatter="formatStatus"/> <el-table-column prop="label" label="时间" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量(个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="招标数量" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="100" /> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="100">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
......
...@@ -30,10 +30,18 @@ ...@@ -30,10 +30,18 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="项目类型" :formatter="formatStatus" width="100"/> <el-table-column prop="type" label="项目类型" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量 (个)" align="right" :formatter="formatStatus" sortable width="130"/> <el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="countRate" label="数量占比(%)" align="right" :formatter="formatStatus" sortable width="140"/> <template slot-scope="scope">{{ scope.row.count }}</template>
<el-table-column prop="money" label="中标总金额 (万元)" align="right" :formatter="formatStatus" sortable width="170"/> </el-table-column>
<el-table-column prop="moneyRate" label="金额占比(%)" align="right" :formatter="formatStatus" sortable width="140"/> <el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="money" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<template slot-scope="scope">{{ scope.row.money }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -70,10 +78,18 @@ ...@@ -70,10 +78,18 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus" width="100"/> <el-table-column prop="province" label="地区" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量 (个)" align="right" :formatter="formatStatus" sortable width="130"/> <el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="countRate" label="数量占比(%)" align="right" :formatter="formatStatus" sortable width="150"/> <template slot-scope="scope">{{ scope.row.count }}</template>
<el-table-column prop="sumMoney" label="中标总金额 (万元)" align="right" :formatter="formatStatus" sortable width="170"/> </el-table-column>
<el-table-column prop="moneyRate" label="金额占比(%)" align="right" :formatter="formatStatus" sortable width="145"/> <el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<template slot-scope="scope">{{ scope.row.sumMoney }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -110,8 +126,12 @@ ...@@ -110,8 +126,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="rangeName" label="中标金额" :formatter="formatStatus"/> <el-table-column prop="rangeName" label="中标金额" :formatter="formatStatus"/>
<el-table-column prop="count" label="中标数量 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="rate" label="占比(%)" align="right" :formatter="formatStatus" width="120" sortable/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="120" sortable>
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -145,8 +165,12 @@ ...@@ -145,8 +165,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="year" label="年份" :formatter="formatStatus" width="100"/> <el-table-column prop="year" label="年份" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量 (个)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="sumMoney" label="中标总金额(万元)" align="right" :formatter="formatStatus"/> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus">
<template slot-scope="scope">{{ scope.row.sumMoney }}万元</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -183,8 +207,12 @@ ...@@ -183,8 +207,12 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="label" label="时间" :formatter="formatStatus" width="130"/> <el-table-column prop="label" label="时间" :formatter="formatStatus" width="130"/>
<el-table-column prop="rate" label="下浮率(%)" align="right" :formatter="formatStatus" sortable/> <el-table-column prop="rate" label="下浮率" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="count" label="统计项目数量 (个)" align="right" :formatter="formatStatus"/> <template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
<el-table-column prop="count" label="统计项目数量" align="right" :formatter="formatStatus">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -225,9 +253,15 @@ ...@@ -225,9 +253,15 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="month" label="时间" :formatter="formatStatus" width="120"/> <el-table-column prop="month" label="时间" :formatter="formatStatus" width="120"/>
<el-table-column prop="sgRate" label="施工类下浮率(%)" align="right" :formatter="formatStatus" width="160"/> <el-table-column prop="sgRate" label="施工类下浮率" align="right" :formatter="formatStatus" width="160">
<el-table-column prop="kcsjRate" label="勘察设计类下浮率(%)" align="right" :formatter="formatStatus"/> <template slot-scope="scope">{{ scope.row.sgRate }}%</template>
<el-table-column prop="jlRate" label="监理类下浮率(%)" align="right" :formatter="formatStatus" width="160"/> </el-table-column>
<el-table-column prop="kcsjRate" label="勘察设计类下浮率" align="right" :formatter="formatStatus">
<template slot-scope="scope">{{ scope.row.kcsjRate }}%</template>
</el-table-column>
<el-table-column prop="jlRate" label="监理类下浮率" align="right" :formatter="formatStatus" width="160">
<template slot-scope="scope">{{ scope.row.jlRate }}%</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment