Skip to content

D
dsk-cr20g
Commit c33bf91b authored by tanyang's avatar tanyang
Browse files
Options

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

parents 87224df7 af9f842f
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 35 deletions
dsk-operate-ui/src/views/index.vue
View file @ c33bf91b
......@@ -111,7 +111,7 @@
<el-progress class="progress2" :text-inside="true" :stroke-width="14" :percentage="70"></el-progress>
</div>
<div style="background: #ffffff;margin: 0 12px 12px 12px;">
<div id="pm-echarts" style="height: 288px;"></div>
<div id="pm-echarts" style="height: 400px;"></div>
</div>
</div>
</div>
......@@ -279,6 +279,20 @@
<span>中标单位：中铁十二局集团</span>
</p>
</div>
<div class="item">
<h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
<p>
<span>中标金额：4754.34</span>
<span>中标单位：中铁十二局集团</span>
</p>
</div>
<div class="item">
<h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
<p>
<span>中标金额：4754.34</span>
<span>中标单位：中铁十二局集团</span>
</p>
</div>
</div>
</div>
<div v-if="user === 2" class="zbhxr">
......@@ -314,6 +328,24 @@
<span>中标金额：4754.34</span>
</p>
</div>
<div class="item">
<h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
<p>
<span>中标金额：4754.34</span>
</p>
</div>
<div class="item">
<h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
<p>
<span>中标金额：4754.34</span>
</p>
</div>
<div class="item">
<h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
<p>
<span>中标金额：4754.34</span>
</p>
</div>
</div>
</div>
</div>
......@@ -429,6 +461,24 @@ export default {
name:'重庆机场集团',
time:'2023-04-12 14: 00'
},
{
title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
user:'李婷婷',
name:'重庆机场集团',
time:'2023-04-12 14: 00'
},
{
title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
user:'李婷婷',
name:'重庆机场集团',
time:'2023-04-12 14: 00'
},
{
title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
user:'李婷婷',
name:'重庆机场集团',
time:'2023-04-12 14: 00'
},
],
pmData:[
{
......@@ -974,6 +1024,7 @@ export default {
margin: 0;
}
.home {
padding-bottom:24px;
::v-deep .el-row{
.el-col:nth-child(1){
padding-left: 0 !important;
......@@ -1089,18 +1140,18 @@ export default {
}
.content-wrap{
margin-bottom: 12px;
height: 460px;
height: 587px;
.select-popper{
margin-right:0;
}
.record{
height: 460px;
height: 587px;
background: #FFFFFF;
border-radius: 4px;
padding: 16px;
position: relative;
.list{
height: 375px;
height: 510px;
overflow: hidden;
.item{
border-bottom: 1px solid #EEEEEE;
......@@ -1131,27 +1182,28 @@ export default {
text-align: center;
color: #0081FF;
font-size: 14px;
margin-top: 4px;
cursor: pointer;
position: absolute;
bottom:16px;
left: 50%;
margin-left: -48px;
width: 95%;
height: 60px;
line-height: 60px;
background: linear-gradient(360deg, #FFFFFF 0%, #FFFFFF 17%, rgba(255,255,255,0.6) 100%);
bottom: 0;
}
}
.ranking{
height: 460px;
height: 587px;
background: #FFFFFF;
border-radius: 4px;
padding: 16px;
.main{
background: url("../assets/images/index/yjpm_bg.png");
background-size: 100% 100%;
height: 399px;
height: 525px;
margin-top: 10px;
}
.amount{
padding: 16px 24px;
padding: 16px 12px;
p{
display: flex;
justify-content: space-between;
......@@ -1175,6 +1227,8 @@ export default {
}
.progress1{
height: 10px !important;
margin-bottom:6px;
margin-top:8px;
::v-deep .el-progress-bar__outer{
.el-progress-bar__inner{
background:#9AEAD3
......@@ -1303,6 +1357,7 @@ export default {
font-size: 14px;
span{
margin-right: 24px;
color:rgba(35, 35, 35, 0.8);
}
}
.btn{
......@@ -1380,7 +1435,7 @@ export default {
background: #FFFFFF;
border-radius: 4px;
padding: 16px;
height: 440px;
height: 617px;
overflow: hidden;
position: relative;
::v-deep .el-tabs__header{
......@@ -1388,7 +1443,7 @@ export default {
}
::v-deep .el-tabs__content{
overflow-y: auto;
height: 368px;
height: 567px;
}
::v-deep .el-timeline{
.el-timeline-item{
......@@ -1528,7 +1583,7 @@ export default {
}
}
.zbgg{
height: 470px;
height: 599px;
background: #FFFFFF;
border-radius: 4px;
padding: 16px;
......@@ -1570,7 +1625,7 @@ export default {
}
}
.zbhxr{
height: 382px;
height: 558px;
background: #FFFFFF;
border-radius: 4px;
padding: 16px;
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ c33bf91b
......@@ -105,22 +105,24 @@ export default {
params.county=this.provinceId[2]
}
bidMoneyGroupByProjectType(params).then(res => {
let list=res.data[1].type
for (let i=0; i<res.data[0].type.length; i++){
for (let j=0; j<list.length; j++){
if(res.data[0].type[i].projectType === list[j].projectType){
list[j].lastMoney=res.data[0].type[i].money;
list[j].lastRate=res.data[0].type[i].rate;
if(res.data.length > 0){
let list=res.data[1].type
for (let i=0; i<res.data[0].type.length; i++){
for (let j=0; j<list.length; j++){
if(res.data[0].type[i].projectType === list[j].projectType){
list[j].lastMoney=res.data[0].type[i].money;
list[j].lastRate=res.data[0].type[i].rate;
}
}
}
for(let i=0; i<list.length; i++){
list[i].money=Number(list[i].money).toFixed(2)
list[i].rate=Number(list[i].rate).toFixed(2)
list[i].lastMoney=Number(list[i].lastMoney).toFixed(2)
list[i].lastRate=Number(list[i].lastRate).toFixed(2)
}
this.tableData=list.reverse()
}
for(let i=0; i<list.length; i++){
list[i].money=Number(list[i].money).toFixed(2)
list[i].rate=Number(list[i].rate).toFixed(2)
list[i].lastMoney=Number(list[i].lastMoney).toFixed(2)
list[i].lastRate=Number(list[i].lastRate).toFixed(2)
}
this.tableData=list.reverse()
})
},
getGroupCount(){
......
dsk-operate-ui/src/views/macro/financing/details.vue
View file @ c33bf91b
......@@ -130,9 +130,9 @@
{{formatDate(scope.row.tenderDate)}}
</template>
</el-table-column>
<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" />
<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
<el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" :formatter="formatStatus"/>
<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" :formatter="formatStatus"/>
<el-table-column prop="isUsedCapital" label="是否资本金" width="200" :formatter="formatStatus"/>
</el-table>
</div>
</div>
......@@ -185,7 +185,10 @@ export default {
// var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
// return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
return year + '-' + month + '-' + day
}
},
formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-'
},
}
}
</script>
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ c33bf91b
......@@ -121,7 +121,7 @@
<div class="item">
<div class="left">
<p>{{statistics.accountsReceivable}}<span>亿元</span></p>
<span>营收账款</span>
<span>应收账款</span>
</div>
<img src="@/assets/images/urban/img4.png">
</div>
......
dsk-operate-ui/vue.config.js
View file @ c33bf91b
......@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://47.104.91.229:9099/prod-api`,
target: `http://122.9.160.122:9011`,
target: `http://47.104.91.229:9099/prod-api`,
// target: `http://122.9.160.122:9011`,
// target: `http://192.168.60.126:9011`,
// target: `http://192.168.60.27:8766`,
changeOrigin: true,
......
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