Skip to content

D
dsk-cr20g
Commit 8138fdd0 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

parents a33c121e c33bf91b
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 52 deletions
dsk-admin/pom.xml
View file @ 8138fdd0
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}</finalName> <finalName>dsk-operate-sys</finalName>
</build> </build>
</project> </project>
dsk-admin/src/main/resources/application-test.yml
View file @ 8138fdd0
...@@ -134,7 +134,7 @@ spring: ...@@ -134,7 +134,7 @@ spring:
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 6 database: 15
# 密码 # 密码
password: zfTFIJjaN#6xB83r password: zfTFIJjaN#6xB83r
# 连接超时时间 # 连接超时时间
......
dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsPageDto.java
View file @ 8138fdd0
...@@ -26,17 +26,6 @@ public class SpecialPurposeBondsPageDto extends BasePage { ...@@ -26,17 +26,6 @@ public class SpecialPurposeBondsPageDto extends BasePage {
*/ */
private Integer areaId; private Integer areaId;
/**
* 市Id
*/
private Integer cityId;
/**
* 区Id
*/
private Integer areaId;
/** /**
* 排序字段 默认-投资金额 * 排序字段 默认-投资金额
*/ */
......
dsk-operate-ui/src/assets/styles/index.scss
View file @ 8138fdd0
...@@ -524,6 +524,10 @@ ul, li { ...@@ -524,6 +524,10 @@ ul, li {
line-height: 50px; line-height: 50px;
height: 50px; height: 50px;
} }
.el-tabs__item.is-disabled {
color: #C0C4CC;
cursor: not-allowed;
}
.is-active{ .is-active{
color: #0081FF; color: #0081FF;
font-weight: bold; font-weight: bold;
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 8138fdd0
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
.headForm{ .headForm{
margin-bottom: 14px; margin-bottom: 14px;
.common-title{ .common-title{
margin-right: 19px; margin-right: 24px;
} }
::v-deep .el-input__inner{ ::v-deep .el-input__inner{
border: 1px solid #D9D9D9; border: 1px solid #D9D9D9;
......
dsk-operate-ui/src/views/detail/party-a/financial/index.vue
View file @ 8138fdd0
...@@ -199,9 +199,12 @@ export default { ...@@ -199,9 +199,12 @@ export default {
}, },
color: ['#5B9CF7','#8DCF96','#FFDC6B','#FE9C77','#8A82F3'], color: ['#5B9CF7','#8DCF96','#FFDC6B','#FE9C77','#8A82F3'],
legend: { legend: {
selectedMode: false,
x: 'center', x: 'center',
y: 'bottom', y: 'bottom',
itemHeight: 9, itemHeight: 9,
itemWidth:12,
itemHeight:8,
textStyle: { textStyle: {
padding: [0, 0, -2, 0], padding: [0, 0, -2, 0],
color: '#000000', color: '#000000',
...@@ -248,6 +251,30 @@ export default { ...@@ -248,6 +251,30 @@ export default {
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.clear() //清空 myChart.clear() //清空
myChart.setOption(option) myChart.setOption(option)
// 默认高亮
let index = 0; // 高亮索引
myChart.dispatchAction({
type: "highlight",
seriesIndex: index,
dataIndex: index
});
myChart.on("mouseover", function(e) {
if (e.dataIndex != index) {
myChart.dispatchAction({
type: "downplay",
seriesIndex: 0,
dataIndex: index
});
}
});
myChart.on("mouseout", function(e) {
index = e.dataIndex;
myChart.dispatchAction({
type: "highlight",
seriesIndex: 0,
dataIndex: e.dataIndex
});
});
} }
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/overview/branch.vue
View file @ 8138fdd0
...@@ -102,5 +102,9 @@ export default { ...@@ -102,5 +102,9 @@ export default {
} }
} }
} }
::v-deep .el-input__inner{
padding-left: 10px;
padding-right: 22px;
}
} }
</style> </style>
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ 8138fdd0
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div> <div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div>
</div> </div>
</div> </div>
<div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div> <div id="myEcharts" style="height:250px; margin: 0 auto;"></div>
</template> </template>
<div class="bid-no-data" v-else> <div class="bid-no-data" v-else>
<no-data /> <no-data />
......
dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
View file @ 8138fdd0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane selfTab"> <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane selfTab">
<el-tab-pane label="股东" name="first"></el-tab-pane> <el-tab-pane label="股东" name="first"></el-tab-pane>
<el-tab-pane label="对外投资" name="second"></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="分支机构" :disabled="affiliatesTotal<1" name="third"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="table-item"> <div class="table-item">
<div class="rela-person" v-show="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div> <div class="rela-person" v-show="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div>
......
dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue
View file @ 8138fdd0
...@@ -172,6 +172,8 @@ export default { ...@@ -172,6 +172,8 @@ export default {
bottom: 20, bottom: 20,
data: this.viewData, data: this.viewData,
pageButtonPosition: 'end', pageButtonPosition: 'end',
itemWidth:12,
itemHeight:8,
}, },
color: ['#8A82F3','#5B9CF7','#43BBE0','#8ECF95','#FFDC6B', '#FE9C77', '#E8649B', '#8A82F3'], color: ['#8A82F3','#5B9CF7','#43BBE0','#8ECF95','#FFDC6B', '#FE9C77', '#E8649B', '#8A82F3'],
series: [ series: [
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 8138fdd0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div style="position:relative" v-for="(itme,i) in personnelList" <div style="position:relative" v-for="(itme,i) in personnelList"
:class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)"> :class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)">
<p>{{itme.value}}</p> <p>{{itme.value}}</p>
<img v-if="i==1" style="position: absolute;top:-10px;" src="@/assets/images/owner/tip.png" alt=""> <img v-if="i==1" style="position: absolute;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt="">
</div> </div>
</div> </div>
......
dsk-operate-ui/src/views/index.vue
View file @ 8138fdd0
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<el-progress class="progress2" :text-inside="true" :stroke-width="14" :percentage="70"></el-progress> <el-progress class="progress2" :text-inside="true" :stroke-width="14" :percentage="70"></el-progress>
</div> </div>
<div style="background: #ffffff;margin: 0 12px 12px 12px;"> <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> </div>
</div> </div>
...@@ -279,6 +279,20 @@ ...@@ -279,6 +279,20 @@
<span>中标单位：中铁十二局集团</span> <span>中标单位：中铁十二局集团</span>
</p> </p>
</div> </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> </div>
<div v-if="user === 2" class="zbhxr"> <div v-if="user === 2" class="zbhxr">
...@@ -314,6 +328,24 @@ ...@@ -314,6 +328,24 @@
<span>中标金额：4754.34</span> <span>中标金额：4754.34</span>
</p> </p>
</div> </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> </div>
</div> </div>
...@@ -429,6 +461,24 @@ export default { ...@@ -429,6 +461,24 @@ export default {
name:'重庆机场集团', name:'重庆机场集团',
time:'2023-04-12 14: 00' 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:[ pmData:[
{ {
...@@ -974,6 +1024,7 @@ export default { ...@@ -974,6 +1024,7 @@ export default {
margin: 0; margin: 0;
} }
.home { .home {
padding-bottom:24px;
::v-deep .el-row{ ::v-deep .el-row{
.el-col:nth-child(1){ .el-col:nth-child(1){
padding-left: 0 !important; padding-left: 0 !important;
...@@ -1089,18 +1140,18 @@ export default { ...@@ -1089,18 +1140,18 @@ export default {
} }
.content-wrap{ .content-wrap{
margin-bottom: 12px; margin-bottom: 12px;
height: 460px; height: 587px;
.select-popper{ .select-popper{
margin-right:0; margin-right:0;
} }
.record{ .record{
height: 460px; height: 587px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
padding: 16px; padding: 16px;
position: relative; position: relative;
.list{ .list{
height: 375px; height: 510px;
overflow: hidden; overflow: hidden;
.item{ .item{
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
...@@ -1131,27 +1182,28 @@ export default { ...@@ -1131,27 +1182,28 @@ export default {
text-align: center; text-align: center;
color: #0081FF; color: #0081FF;
font-size: 14px; font-size: 14px;
margin-top: 4px;
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
bottom:16px; width: 95%;
left: 50%; height: 60px;
margin-left: -48px; line-height: 60px;
background: linear-gradient(360deg, #FFFFFF 0%, #FFFFFF 17%, rgba(255,255,255,0.6) 100%);
bottom: 0;
} }
} }
.ranking{ .ranking{
height: 460px; height: 587px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
padding: 16px; padding: 16px;
.main{ .main{
background: url("../assets/images/index/yjpm_bg.png"); background: url("../assets/images/index/yjpm_bg.png");
background-size: 100% 100%; background-size: 100% 100%;
height: 399px; height: 525px;
margin-top: 10px; margin-top: 10px;
} }
.amount{ .amount{
padding: 16px 24px; padding: 16px 12px;
p{ p{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -1175,6 +1227,8 @@ export default { ...@@ -1175,6 +1227,8 @@ export default {
} }
.progress1{ .progress1{
height: 10px !important; height: 10px !important;
margin-bottom:6px;
margin-top:8px;
::v-deep .el-progress-bar__outer{ ::v-deep .el-progress-bar__outer{
.el-progress-bar__inner{ .el-progress-bar__inner{
background:#9AEAD3 background:#9AEAD3
...@@ -1303,6 +1357,7 @@ export default { ...@@ -1303,6 +1357,7 @@ export default {
font-size: 14px; font-size: 14px;
span{ span{
margin-right: 24px; margin-right: 24px;
color:rgba(35, 35, 35, 0.8);
} }
} }
.btn{ .btn{
...@@ -1380,7 +1435,7 @@ export default { ...@@ -1380,7 +1435,7 @@ export default {
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
padding: 16px; padding: 16px;
height: 440px; height: 617px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
::v-deep .el-tabs__header{ ::v-deep .el-tabs__header{
...@@ -1388,7 +1443,7 @@ export default { ...@@ -1388,7 +1443,7 @@ export default {
} }
::v-deep .el-tabs__content{ ::v-deep .el-tabs__content{
overflow-y: auto; overflow-y: auto;
height: 368px; height: 567px;
} }
::v-deep .el-timeline{ ::v-deep .el-timeline{
.el-timeline-item{ .el-timeline-item{
...@@ -1528,7 +1583,7 @@ export default { ...@@ -1528,7 +1583,7 @@ export default {
} }
} }
.zbgg{ .zbgg{
height: 470px; height: 599px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
padding: 16px; padding: 16px;
...@@ -1570,7 +1625,7 @@ export default { ...@@ -1570,7 +1625,7 @@ export default {
} }
} }
.zbhxr{ .zbhxr{
height: 382px; height: 558px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
padding: 16px; padding: 16px;
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ 8138fdd0
...@@ -105,22 +105,24 @@ export default { ...@@ -105,22 +105,24 @@ export default {
params.county=this.provinceId[2] params.county=this.provinceId[2]
} }
bidMoneyGroupByProjectType(params).then(res => { bidMoneyGroupByProjectType(params).then(res => {
let list=res.data[1].type if(res.data.length > 0){
for (let i=0; i<res.data[0].type.length; i++){ let list=res.data[1].type
for (let j=0; j<list.length; j++){ for (let i=0; i<res.data[0].type.length; i++){
if(res.data[0].type[i].projectType === list[j].projectType){ for (let j=0; j<list.length; j++){
list[j].lastMoney=res.data[0].type[i].money; if(res.data[0].type[i].projectType === list[j].projectType){
list[j].lastRate=res.data[0].type[i].rate; 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(){ getGroupCount(){
......
dsk-operate-ui/src/views/macro/financing/details.vue
View file @ 8138fdd0
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
{{formatDate(scope.row.tenderDate)}} {{formatDate(scope.row.tenderDate)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" /> <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" :formatter="formatStatus"/>
<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" /> <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" :formatter="formatStatus"/>
<el-table-column prop="isUsedCapital" label="是否资本金" width="200" /> <el-table-column prop="isUsedCapital" label="是否资本金" width="200" :formatter="formatStatus"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -185,7 +185,10 @@ export default { ...@@ -185,7 +185,10 @@ export default {
// var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() // var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
// return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds // return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
return year + '-' + month + '-' + day return year + '-' + month + '-' + day
} },
formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-'
},
} }
} }
</script> </script>
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 8138fdd0
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<div class="item"> <div class="item">
<div class="left"> <div class="left">
<p>{{statistics.accountsReceivable}}<span>亿元</span></p> <p>{{statistics.accountsReceivable}}<span>亿元</span></p>
<span>营收账款</span> <span>应收账款</span>
</div> </div>
<img src="@/assets/images/urban/img4.png"> <img src="@/assets/images/urban/img4.png">
</div> </div>
......
dsk-operate-ui/vue.config.js
View file @ 8138fdd0
...@@ -34,8 +34,8 @@ module.exports = { ...@@ -34,8 +34,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://47.104.91.229:9099/prod-api`, target: `http://47.104.91.229:9099/prod-api`,
target: `http://122.9.160.122:9011`, // target: `http://122.9.160.122:9011`,
// target: `http://192.168.60.126:9011`, // target: `http://192.168.60.126:9011`,
// target: `http://192.168.60.27:8766`, // target: `http://192.168.60.27:8766`,
changeOrigin: true, 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