Skip to content

D
dsk-cr20g
Commit c4def54f authored by danfuman's avatar danfuman
Browse files
Options

修改

parent a9c26765
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1656 additions and 638 deletions
dsk-operate-ui/src/api/macro/macro.js
View file @ c4def54f
......@@ -51,6 +51,48 @@ export function getYear() {
})
}
//全国商机项目分析-全国土地交易项目
export function countLandMarketByType(param) {
return request({
url: '/marketAnalysis/countLandMarketByType',
method: 'POST',
data: param
})
}
//全国商机项目分析-全国土地交易项目地区TOP10
export function countLandMarketByProvince(param) {
return request({
url: '/marketAnalysis/countLandMarketByProvince',
method: 'POST',
data: param
})
}
//全国商机项目分析-全国各地区招标统计TOP10
export function countNewsBidByProvince(param) {
return request({
url: '/marketAnalysis/countNewsBidByProvince',
method: 'POST',
data: param
})
}
//全国商机项目分析-全国土地交易项目年份统计
export function countLandMarketByYear() {
return request({
url: '/marketAnalysis/countLandMarketByYear',
method: 'POST',
})
}
//全国商机项目分析-全国土地交易项目年份统计
export function countBidGroupByProvince(param) {
return request({
url: '/marketAnalysis/countBidGroupByProvince',
method: 'POST',
data: param
})
}
//全国建筑企业概览-资质等级按照行业、等级类型分组
export function certGroupByMajorAndLevel() {
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ c4def54f
......@@ -36,12 +36,12 @@
</el-table-column>
<el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
<el-table-column prop="gdpGrowth" label="GDP增速" sortable width="100" :formatter="formatStatus"/>
<el-table-column prop="gdpGrowth" label="GDP增速（%）" sortable width="100" :formatter="formatStatus"/>
<el-table-column prop="gdpPerCapita" label="人均GDP（元）" sortable width="130" :formatter="formatStatus"/>
<el-table-column prop="population" label="人口（万人）" sortable width="120" :formatter="formatStatus"/>
<el-table-column prop="fixedInvestment" label="固定资产投资 （亿元） " sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="gbr" label="一般公共预算收入（亿元）" sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="gbe" label="一般公共预算支出（亿 元）" sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="gbe" label="一般公共预算支出（亿元）" sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="govFundIncome" label="政府性基金收入（亿元）" sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="govDebtBalance" label="地方政府债务余额（亿元）" sortable width="200" :formatter="formatStatus"/>
<el-table-column prop="uipInterestBearingDebt" label="城投平台有息债务（亿元）" sortable width="200" :formatter="formatStatus"/>
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ c4def54f
......@@ -66,8 +66,8 @@
<div class="content content2">
<div class="common-title">经济信息</div>
<div class="content-box">
<span class="text" @click="childMethod(1)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_1.png"><span>下属辖区</span> <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
<span class="text" @click="childMethod(2)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_2.png"><span>城投平台</span> <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
<span class="text hover" @click="childMethod(1)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_1.png"><span>下属辖区</span> <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
<span class="text hover" @click="childMethod(2)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_2.png"><span>城投平台</span> <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
<span class="text"><img src="@/assets/images/economies/icon_3.png"><span>城投平台授信余额</span> <label>{{recentlyYear.creditBalance}}<i>亿</i></label></span>
<span class="text"><img src="@/assets/images/economies/icon_4.png"><span>城投平台应收账款</span> <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
<span class="text"><img src="@/assets/images/economies/icon_5.png"><span>城投平台有息债务</span> <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span>
......@@ -163,6 +163,10 @@ export default {
prop: 'industryTotalValue',
label: '工业总产值（亿元）',
},
{
prop: 'fixedInvestment',
label: '固定资产投资（亿元）',
},
{
prop: 'realEstateInvestment',
label: '房地产开发投资（亿元）',
......@@ -376,7 +380,7 @@ export default {
grid: {
top:20,
// right:15,
bottom:0,
bottom:5,
},
series: [
{
......@@ -388,7 +392,7 @@ export default {
focus: 'none'
},
label: {
show: true,
show: this.valData[1] ? true : false,
position: 'top'
},
//设置折线颜色和粗细
......@@ -438,7 +442,7 @@ export default {
},
grid: {
top:20,
bottom:0,
bottom:5,
},
series: [
{
......@@ -450,7 +454,7 @@ export default {
focus: 'none'
},
label: {
show: true,
show: this.valData1[1] ? true : false,
position: 'top'
},
itemStyle:{
......@@ -500,7 +504,7 @@ export default {
},
grid: {
top:20,
bottom:0,
bottom:5,
},
series: [
{
......@@ -512,7 +516,7 @@ export default {
focus: 'none'
},
label: {
show: true,
show: this.valData2[1] ? true : false,
position: 'top'
},
//设置折线颜色和粗细
......@@ -562,7 +566,7 @@ export default {
},
grid: {
top:20,
bottom:0,
bottom:5,
},
series: [
{
......@@ -574,7 +578,7 @@ export default {
focus: 'none'
},
label: {
show: true,
show: this.valData3[1] ? true : false,
position: 'top'
},
//设置折线颜色和粗细
......@@ -625,7 +629,7 @@ export default {
grid: {
top:20,
// left:5,
bottom:0,
bottom:5,
},
series: [
{
......@@ -637,7 +641,7 @@ export default {
focus: 'none'
},
label: {
show: true,
show: this.valData4[1] ? true : false,
position: 'top',
},
//设置折线颜色和粗细
......@@ -793,6 +797,14 @@ export default {
.content2{
.content-box{
margin-top: 18px;
.hover:hover{
label{
color:#0081ff;
i{
color:#0081ff;
}
}
}
.text{
border-right: 1px solid #E4E4E4;
display: inline-block;
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ c4def54f
......@@ -4,14 +4,14 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
<el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
<el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
<!--<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>-->
<el-tab-pane label="全国中标市场分析" name="fourth"></el-tab-pane>
</el-tabs>
</div>
<Economic v-if="activeName === 'first'"></Economic>
<Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
<Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
<!--<Zhongbiao v-if="activeName === 'third'"></Zhongbiao>-->
<Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
</div>
</template>
......@@ -28,7 +28,7 @@ export default {
},
data() {
return {
activeName: 'first'
activeName: 'second'
}
},
created() {
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ c4def54f
......@@ -162,8 +162,8 @@
<el-table-column prop="companyName" label="公司名称" width="300" fixed>
<template slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
<span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
<span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
<span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === null || scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
<span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
</template>
</el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
......@@ -785,8 +785,7 @@ export default {
registerAddress:registerAddress,
creditCode:res.data.creditCode,
}
customerStatus(item.companyName.replace(/<[^>]+>/g, '')).then(res => {
if(res.data === 1){
if(item.claimStatus === 1){
this.claimVisible1=true;
}else {
claim(params).then(res => {
......@@ -796,9 +795,10 @@ export default {
this.querySubmit()
}
})
}
})
// customerStatus(item.companyName.replace(/<[^>]+>/g, '')).then(res => {
//
// })
}
})
}
......
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