Skip to content

D
dsk-cr20g
Commit bb6d2114 authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/dev20230707' into dev20230707

parents 2a8c74f2 340697f7
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 72 deletions
dsk-operate-ui/src/views/macro/economies/component/comparison.vue
View file @ bb6d2114
......@@ -329,9 +329,9 @@ export default {
if(this.provinceId.length >= 2){
item.areaId=this.provinceId[2]
}
if(this.dataQuery.id){
item.id=this.dataQuery.id
}
// if(this.dataQuery.id){
// item.id=this.dataQuery.id
// }
this.compareList.splice(0,1,item);
this.value1Flag=true
this.addressValue1=this.dataQuery.province.join('-')
......@@ -472,9 +472,9 @@ export default {
if(code.length >= 3){
item.areaId=code[2]
}
if(this.dataQuery.id){
item.id=this.dataQuery.id
}
// if(this.dataQuery.id){
// item.id=this.dataQuery.id
// }
this.compareList.splice(index-1,1,item);
let list=[];
......
dsk-operate-ui/src/views/macro/economies/index.vue
View file @ bb6d2114
......@@ -74,14 +74,30 @@ export default {
this.provinceId.push(this.dataQuery.provinceId)
}else {
location({}).then(res => {
this.province=res.data.province;
if(res.data.area){
this.province=res.data.area
}else {
if(res.data.city){
this.province=res.data.city
}else {
this.province=res.data.province
}
}
if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.provinceId
if(res.data.areaId){
this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
}else {
if(res.data.cityId){
this.provinceId=[res.data.provinceId,res.data.cityId]
}else {
this.provinceId=[res.data.provinceId]
}
}
let arr=[res.data.province]
this.dataQuery.province=arr;
this.provinceId.push(res.data.provinceId)
}else {
this.provinceId.push(this.dataQuery.provinceId)
this.provinceId=this.dataQuery.provinceId
}
})
}
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ bb6d2114
......@@ -3,7 +3,7 @@
<Region v-if="province" :province="province" :dataQuery="dataQuery" @addressListbtn="addressListbtn"></Region>
<div class="content">
<div class="common-title">专项债项目</div>
<div class="content-box">
<div class="content-box" v-if="!state">
<div class="box-left">
<div id="echarts" style="height: 400px"></div>
</div>
......@@ -27,6 +27,12 @@
</el-table>
</div>
</div>
<div class="content-box" v-else>
<div class="empty">
<img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉，暂无专项债项目数据</div>
</div>
</div>
</div>
<div class="content">
<div class="common-title flex-box">
......@@ -98,28 +104,45 @@ export default {
MaxPage:1000,
dataQuery:{},
province:'',
provinceId:[]
provinceId:[],
state:false,
}
},
created() {
location({}).then(res => {
this.province=res.data.province;
if(res.data.area){
this.province=res.data.area
}else {
if(res.data.city){
this.province=res.data.city
}else {
this.province=res.data.province
}
}
if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.provinceId
if(res.data.areaId){
this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
}else {
if(res.data.cityId){
this.provinceId=[res.data.provinceId,res.data.cityId]
}else {
this.provinceId=[res.data.provinceId]
}
}
let arr=[res.data.province]
this.dataQuery.province=arr;
this.provinceId.push(res.data.provinceId)
}else {
this.provinceId.push(this.dataQuery.provinceId)
this.provinceId=this.dataQuery.provinceId
}
this.getData()
this.getStatistics()
this.$nextTick(() => {
this.getData()
this.getStatistics()
})
})
},
mounted() {
this.$nextTick(() => {
})
},
methods: {
getData(){
......@@ -184,57 +207,71 @@ export default {
return New.value - old.value
})
let data=[]
for(let i=0; i<10; i++){
data.push(arr[i])
if(arr.length >= 10){
for(let i=0; i<10; i++){
data.push(arr[i])
}
}else {
for(let i=0; i<arr.length; i++){
data.push(arr[i])
}
}
this.total=this.tableData.length;
if(this.tableData.length > 0){
this.state=false;
this.initChart(data)
}else {
this.state=true;
}
this.initChart(data)
})
},
initChart(data) {
let myChart = echarts.init(document.getElementById("echarts"))
let option ={
tooltip: {
trigger: 'item',
borderWidth:0,
backgroundColor:"rgba(255, 255, 255, 0.8)",
formatter: function (params) {
var result = ''
result+='<h3 style="color: #232226;padding: 0 0 5px 0;margin: 0;">'+ params.data.name +'</h3>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.number +'个</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.value +'亿元</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.proportion +'%</p>'
return result;
this.$nextTick(() => {
let myChart = echarts.init(document.getElementById("echarts"))
let option ={
tooltip: {
trigger: 'item',
borderWidth:0,
backgroundColor:"rgba(255, 255, 255, 0.8)",
formatter: function (params) {
var result = ''
result+='<h3 style="color: #232226;padding: 0 0 5px 0;margin: 0;">'+ params.data.name +'</h3>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.number +'个</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.value +'亿元</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.proportion +'%</p>'
return result;
},
extraCssText:'width:150px!important;',
},
extraCssText:'width:150px!important;',
},
legend: {
type: 'scroll',
orient: 'horizontal',
bottom: 0,
data: data,
itemHeight:8,
itemWidth:12,
pageButtonPosition: 'end',
},
color:['#8A82F3', '#93A1FF', '#63B6EA','#42B393','#8ECF95','#FFDC6B','#FFC08D','#FE9C77','#E8649B','#A151F5'],
series: [
{
type: 'pie',
radius: '55%',
center: ['50%', '50%'],
legend: {
type: 'scroll',
orient: 'horizontal',
bottom: 0,
data: data,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
itemHeight:8,
itemWidth:12,
pageButtonPosition: 'end',
},
color:['#8A82F3', '#93A1FF', '#63B6EA','#42B393','#8ECF95','#FFDC6B','#FFC08D','#FE9C77','#E8649B','#A151F5'],
series: [
{
type: 'pie',
radius: '55%',
center: ['50%', '50%'],
data: data,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
}
]
}
myChart.setOption(option);
]
}
myChart.setOption(option);
})
},
formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-'
......@@ -396,6 +433,26 @@ export default {
.box-left{
width: 55%;
}
.empty{
margin: 0 auto;
height: 550px;
text-align: center;
.img{
width: 108px;
height: 108px;
margin-bottom: 24px;
margin-top: 150px;
}
.p1{
color: #333333;
font-size: 16px;
}
.p2{
color: #999999;
font-size: 14px;
margin-top: 8px;
}
}
.box-right{
float: right;
::v-deep .el-table{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ bb6d2114
......@@ -7,7 +7,7 @@
</div>
</div>
<div class="text">{{value}}全国项目招标数量达到{{totalCount}}万个，招标数量前五的地区分别是
{{tableData[0].type}}（{{tableData[0].count}}个）、{{tableData[1].type}}（{{tableData[1].count}}个）、{{tableData[2].type}}（{{tableData[2].count}}个）、{{tableData[3].type}}（{{tableData[3].count}}个）、{{tableData[4].type}}（{{tableData[4].count}}个）。</div>
{{tableData[1].type}}（{{tableData[1].count}}个）、{{tableData[2].type}}（{{tableData[2].count}}个）、{{tableData[3].type}}（{{tableData[3].count}}个）、{{tableData[4].type}}（{{tableData[4].count}}个）、{{tableData[5].type}}（{{tableData[5].count}}个）。</div>
<div class="main1">
<div id="zb-echarts" style="height: 250px"></div>
<p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{value}}全国公开的招标项目，未公开的不含在内</p>
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ bb6d2114
......@@ -247,7 +247,7 @@
<div>认领成功，是否完善客户信息？</div>
<div slot="footer" class="dialog-footer">
<el-button @click="innerVisible = true">
<router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}`" tag="a" >
<router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}&path=business`" tag="a" >
立即完善
</router-link>
</el-button>
......@@ -359,7 +359,6 @@ export default {
this.dataRegion()
this.getType()
this.dataQuery=this.$route.query;
console.log(this.dataQuery)
if(this.dataQuery.provinceId){
if(Array.isArray(this.dataQuery.province)){
this.province=this.dataQuery.province[0];
......@@ -372,18 +371,35 @@ export default {
}else {
this.provinceId.push(this.dataQuery.provinceId)
}
this.querySubmit()
}else {
location({}).then(res => {
this.province=res.data.province;
if(res.data.area){
this.province=res.data.area
}else {
if(res.data.city){
this.province=res.data.city
}else {
this.province=res.data.province
}
}
if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.provinceId
if(res.data.areaId){
this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
}else {
if(res.data.cityId){
this.provinceId=[res.data.provinceId,res.data.cityId]
}else {
this.provinceId=[res.data.provinceId]
}
}
let arr=[res.data.province]
this.dataQuery.province=arr;
this.provinceId.push(res.data.provinceId)
}else {
this.provinceId.push(this.dataQuery.provinceId)
this.provinceId=this.dataQuery.provinceId
}
})
this.querySubmit()
......@@ -408,7 +424,6 @@ export default {
},
// 查询提交
async querySubmit() {
console.log(this.provinceId,"||||")
this.tableLoading = true
const params = { pageNum: this.pageIndex, pageSize: this.pageSize,type:Number(this.queryParams.radio)}
const param={}
......@@ -839,6 +854,9 @@ export default {
/*::v-deep .el-input{*/
width: 260px;
height: 32px;
.el-input__inner:focus{
border-color: #e0e0e0;
}
.el-input-group__prepend:first-child{
padding: 0;
background-color:#ffffff;
......
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