Skip to content

D
dsk-cr20g
Commit 655425ae authored by caixingbing's avatar caixingbing
Browse files
Options

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

parents 849585d5 4108d779
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 95 deletions
dsk-operate-ui/src/api/radar/radar.js
View file @ 655425ae
......@@ -20,6 +20,7 @@ let keywordList = function keywordList(param) {
return request({
url: '/radar/keywordList',
method: 'post',
data: param
})
}
......
dsk-operate-ui/src/assets/styles/project.scss
View file @ 655425ae
......@@ -282,7 +282,7 @@
.el-table .el-table__header-wrapper th,.el-table th.el-table__cell.is-leaf{
color: #4f4f4f;
background: #F0F3FA;
font-size: 12px;
font-size: 13px;
font-weight: 400;
}
.el-table__fixed::before{
......@@ -306,7 +306,7 @@
line-height: 20px;
padding: 0 12px;
color: #232323;
font-size: 12px;
font-size: 13px;
}
.el-table--border .el-table__cell{
border-color: #E6EAF1;
......@@ -897,7 +897,7 @@
}
.el-table__header-wrapper th{
background: #FFFFFF;
font-size: 12px;
font-size: 13px;
opacity: 0.8;
font-weight: 400;
}
......
dsk-operate-ui/src/assets/styles/public.css
View file @ 655425ae
......@@ -1126,3 +1126,6 @@ select {
.performance_pagination_wrap .common-pagination {
margin-top: 16px;
}
.table-item .el-table tr,.table-item .el-table td{
font-size: 13px;
}
\ No newline at end of file
dsk-operate-ui/src/components/Keyword/index.vue
View file @ 655425ae
......@@ -126,25 +126,25 @@ export default {
}
}).catch(error => {
});
this.dialogVisible = true;
if(localStorage.getItem("keyword")){
this.keywordList = JSON.parse(localStorage.getItem("keyword"));
this.options = this.keywordList;
this.content = this.keywordList[this.activeIndex].content;
this.dialogVisible = true;
}else{
api.keywordList().then(res => {
console.log(res);
if(res.code==200){
this.keywordList = res.data
this.options = res.data
localStorage.setItem("keyword",JSON.stringify(res.data.data))
this.content = this.keywordList[this.activeIndex].content;
this.dialogVisible = true;
}
}).catch(error => {
});
}
// this.dialogVisible = true;
// if(localStorage.getItem("keyword")){
// this.keywordList = JSON.parse(localStorage.getItem("keyword"));
// this.options = this.keywordList;
// this.content = this.keywordList[this.activeIndex].content;
// this.dialogVisible = true;
// }else{
// api.keywordList().then(res => {
// console.log(res);
// if(res.code==200){
// this.keywordList = res.data
// this.options = res.data
// localStorage.setItem("keyword",JSON.stringify(res.data.data))
// this.content = this.keywordList[this.activeIndex].content;
// this.dialogVisible = true;
// }
// }).catch(error => {
// });
// }
},
},
......
dsk-operate-ui/src/layout/components/Navbar.vue
View file @ 655425ae
......@@ -4,7 +4,7 @@
<tags-view />
</div>
<div ref="rightMenu" class="flex-box right-menu">
<div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>
<!--<div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
<i class="menu-line" />
<el-dropdown class="avatar-container" trigger="hover">
<div class="flex-box avatar-wrapper">
......
dsk-operate-ui/src/utils/request.js
View file @ 655425ae
......@@ -100,8 +100,7 @@ service.interceptors.response.use(res => {
} else {
return res.data
}
},
error => {
},error => {
console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 655425ae
......@@ -697,9 +697,8 @@ export default {
},
checkuipBusinessbtn(val){
if(val){
this.uipBusinessText =[];
}
this.uipBusinessText =[];
this.checkuipBusiness=true;
this.search();
},
uipBusinessTypebtn(val){
......@@ -711,10 +710,9 @@ export default {
this.search();
},
checkbratingSubjectbtn(val){
if(val){
this.bratingSubjectText =[];
}
this.bratingSubjectText =[];
this.search();
this.checkbratingSubject=true;
},
bratingSubjectLevelbtn(val){
if(val.length>0){
......@@ -725,9 +723,8 @@ export default {
this.search();
},
checkshareholderbtn(val){
if(val){
this.shareholderText =[];
}
this.shareholderText =[];
this.checkshareholder=true;
this.search();
},
shareholderBgbtn(val){
......@@ -739,9 +736,8 @@ export default {
this.search();
},
checkequityRelationshipbtn(val){
if(val){
this.equityRelationshipText =[];
}
this.equityRelationshipText =[];
this.checkequityRelationship=true;
this.search();
},
equityRelationshipbtn(val){
......@@ -820,7 +816,7 @@ export default {
};
var data = JSON.parse(JSON.stringify(this.jskBidQueryDto));
if(this.keys){
params['keys'] = this.keys;
params['keys'] = this.keys.split(' ');
}else{
delete params.keys
}
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 655425ae
......@@ -30,7 +30,7 @@
import "@/assets/styles/public.css";
export default {
name: 'enterpriseData',
name: 'EnterpriseData',
components: { SearchEnterprise,Owner },
data() {
return {
......
dsk-operate-ui/src/views/index.vue
View file @ 655425ae
......@@ -147,7 +147,7 @@
<div class="flex-box query-ability"><span>9</span>全部待办 ></div>
</div>
<div class="list">
<div class="item" v-for="(item,index) in gjjlData" :key="index">
<div class="item" v-for="(item,index) in gjjlData" :key="index" v-if='index < 3'>
<h3>{{item.title}}</h3>
<p>
<span>拜访时间：{{item.time}}</span>
......@@ -1227,7 +1227,7 @@ export default {
}
}
.list{
margin-top: 16px;
margin-top: 12px;
}
.item{
min-height: 62px;
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ 655425ae
......@@ -700,7 +700,7 @@ export default {
.item{
width: 19%;
.item-title{
font-size: 12px;
font-size: 13px;
color: rgba(35,35,35,0.8);
i{
width: 2px;
......@@ -722,7 +722,7 @@ export default {
width: 20px;
height: 20px;
margin-left: 22px;
margin-bottom: -2px;
margin-bottom: 2px;
}
}
.item-text{
......@@ -750,7 +750,7 @@ export default {
border-right: 1px solid #E4E4E4;
display: inline-block;
color: rgba(35,35,35,0.8);
font-size: 12px;
font-size: 13px;
padding-left: 16px;
width: 20%;
line-height: 26px;
......@@ -773,7 +773,7 @@ export default {
font-style: normal;
margin-left: 4px;
font-weight: 400;
font-size: 12px;
font-size: 13px;
}
}
span:last-child{
......
dsk-operate-ui/src/views/macro/economies/index.vue
View file @ 655425ae
......@@ -61,16 +61,26 @@ export default {
},
created() {
this.dataQuery=this.$route.query;
location({}).then(res => {
this.province=res.data.province;
if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.provinceId
this.dataQuery.province=this.province;
this.provinceId.push(res.data.provinceId)
}else {
this.provinceId.push(this.dataQuery.provinceId)
}
})
// let params={}
// if(this.dataQuery.provinceId){
// params.provinceId=this.dataQuery.provinceId
// }
if(this.dataQuery.provinceId){
this.province=this.dataQuery.province;
this.provinceId.push(this.dataQuery.provinceId)
}else {
location({}).then(res => {
this.province=res.data.province;
if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=res.data.provinceId
this.dataQuery.province=this.province;
this.provinceId.push(res.data.provinceId)
}else {
this.provinceId.push(this.dataQuery.provinceId)
}
})
}
if(this.dataQuery.activeName){
this.activeName=this.dataQuery.activeName;
}
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 655425ae
......@@ -37,25 +37,25 @@
<el-table-column label="序号" width="50" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="公司名称" align="left" width="300" fixed>
<el-table-column label="公司名称" align="left" fixed>
<template slot-scope="scope">
<router-link v-if="scope.row.jskEid" :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
<span v-else v-html="scope.row.name" ></span>
</template>
</el-table-column>
<el-table-column label="注册地址" prop="domicile" width="150" :formatter="formatStatus"/>
<el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="专业人员" prop="persionCount" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
<el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
<el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="注册地址" prop="domicile" width="200" :formatter="formatStatus"/>
<el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="专业人员" prop="persionCount" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="120" :formatter="formatStatus"/>
<!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
<!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
<el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
<!--<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
<!--<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
<!--<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>-->
<el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>
<!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
</el-table>
<div class="empty" v-if="tableDataTotal === 0">
<img class="img" src="@/assets/images/project/empty.png">
......
dsk-operate-ui/src/views/macro/financing/details.vue
View file @ 655425ae
......@@ -75,27 +75,27 @@
<div class="main3-box">
<p>
<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
<span>{{details.econData007}}倍</span>
<span>{{details.econData007 || '-'}}{{details.econData007 ? '倍' : ''}}</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本息</label>
<span>{{details.econData008}}倍</span>
<span>{{details.econData008 || '-'}}{{details.econData008 ? '倍' : ''}}</span>
</p>
<p>
<label class="label">项目总收益/项目总投资</label>
<span>{{details.econData009}}倍</span>
<span>{{details.econData009 || '-'}}{{details.econData009 ? '倍' : ''}}</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本金</label>
<span>{{details.econData010}}倍</span>
<span>{{details.econData010 || '-'}}{{details.econData010 ? '倍' : ''}}</span>
</p>
<p>
<label class="label">项目总收益/项目总债务融资本金</label>
<span>{{details.econData011}}倍</span>
<span>{{details.econData011 || '-'}}{{details.econData011 ? '倍' : ''}}</span>
</p>
<p>
<label class="label">项目预测总收益</label>
<span>{{details.projectForecastTotalRevenue}}亿</span>
<span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
</p>
</div>
</div>
......@@ -167,8 +167,8 @@ export default {
})
},
getData(){
const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
// const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
// const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
bondPage(params).then(res => {
this.tableData=res.data.list;
this.tableDataTotal=res.data.totalCount;
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 655425ae
......@@ -52,11 +52,11 @@
<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
</template>
</el-table-column>
<el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
<el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="165" />
<el-table-column prop="projectCapital" label="项目资本金（万元）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
<el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
<!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
<el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
<el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="180" />
<el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
<!--<template slot-scope="scope">-->
<!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 655425ae
......@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column label="地区" min-width="150" align="left" fixed>
<template slot-scope="scope">
<router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
<router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
</template>
</el-table-column>
<el-table-column label="年度明细" prop="id" width="90" align="center" fixed>
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ 655425ae
......@@ -69,7 +69,7 @@
</el-table-column>
<el-table-column prop="type" label="地区"/>
<el-table-column prop="count" sortable label="招标数量" align="right"/>
<el-table-column prop="rate" sortable label="占比" align="right"/>
<el-table-column prop="rate" sortable label="占比（%）" align="right"/>
</el-table>
</div>
</div>
......@@ -527,6 +527,27 @@ export default {
.el-table__cell.is-right{
text-align: right;
}
.has-gutter{
tr{
th:nth-child(4){
border-right:0;
.cell{
padding-right: 24px !important;
}
}
}
}
.el-table__cell.gutter{
background: #F0F3FA;
width: 16px !important;
}
.el-table__row{
td:last-child{
.cell{
padding-right: 24px !important;
}
}
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ 655425ae
......@@ -783,6 +783,20 @@ export default {
.table-item{
margin-top: 32px;
}
.table-item {
::v-deep .el-table {
.has-gutter{
tr{
th:nth-child(3){
border-right:0;
.cell{
padding-right: 24px !important;
}
}
}
}
}
}
}
.table-item{
::v-deep .el-table{
......@@ -794,6 +808,27 @@ export default {
.el-table__cell.is-right{
text-align: right;
}
.has-gutter{
tr{
th:nth-child(6),th:nth-child(8){
border-right:0;
.cell{
padding-right: 24px !important;
}
}
}
}
.el-table__cell.gutter{
/*background: #F0F3FA;*/
width: 16px !important;
}
.el-table__row{
td:last-child{
.cell{
padding-right: 24px !important;
}
}
}
}
}
}
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 655425ae
......@@ -165,7 +165,7 @@
</el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
<template slot-scope="scope">
<router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">
<router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link">
{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</router-link>
<!--<span v-else>-</span>-->
......@@ -477,6 +477,7 @@ export default {
} else {
this.addresslength = 0;
}
this.pageIndex = 1;
this.querySubmit()
},
changeType(item,index){
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 655425ae
......@@ -37,7 +37,7 @@
</div>
</div>
<div class="content_item">
<div class="label">土地信息</div>
<div class="label">项目信息</div>
<div class="content_right">
<div class="select-popper">
<span :class="{ color_text: establishmentDto.projectType.length }">
......@@ -231,7 +231,7 @@
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text">
<span class="content-text-gc">建设规模：</span>
<span class="content-text-p">{{item.buildScale||'--'}}</span>
<span class="content-text-p" v-html="item.buildScale"></span>
</p>
</div>
......@@ -1266,7 +1266,7 @@
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
margin-right: 8px;
padding: 3px 7px;
font-size: 12px;
......@@ -1293,7 +1293,7 @@
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
align-items: flex-start;
margin-right: 27px;
font-size: 14px;
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 655425ae
......@@ -235,7 +235,7 @@
<p class="list-content-text">
<span>受让人：</span>
<span v-if="item.companyName">
<router-link :to="'/company/' + encodeStr(item.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
<router-link :to="'/company/' + encodeStr(item.companyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
</span>
<span v-else>--</span>
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 655425ae
......@@ -881,7 +881,7 @@
},
created() {
this.searchDic();
this.clickProvince(0,1);
// this.clickProvince(0,1);
this.search();
this.changeDown(false)
},
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 655425ae
......@@ -102,32 +102,32 @@
<p>
<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
<span v-if="textList.econData_007">{{textList.econData_007}}倍</span>
<span>--</span>
<span v-else>--</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本息</label>
<span v-if="textList.econData_008">{{textList.econData_008}}倍</span>
<span>--</span>
<span v-else>--</span>
</p>
<p>
<label class="label">项目总收益/项目总投资</label>
<span v-if="textList.econData_009">{{textList.econData_009}}倍</span>
<span>--</span>
<span v-else>--</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本金</label>
<span v-if="textList.econData_010">{{textList.econData_010}}倍</span>
<span>--</span>
<span v-else>--</span>
</p>
<p>
<label class="label">项目总收益/项目总债务融资本金</label>
<span v-if="textList.econData_011">{{textList.econData_011}}倍</span>
<span>--</span>
<span v-else>--</span>
</p>
<p>
<label class="label">项目预测总收益</label>
<span v-if="textList.projectForecastTotalRevenue">{{textList.projectForecastTotalRevenue}}万元</span>
<span>--</span>
<span v-else>--</span>
</p>
</div>
</div>
......@@ -135,11 +135,17 @@
<div class="common-title">项目当事人</div>
<div class="main4-box">
<label class="label">项目主体</label>
<span>{{textList.projectEntity||'--'}}</span>
<span>
<router-link v-if="textList.projectEntity" :to="'/company/' + encodeStr(textList.projectEntityId) + '/?index=true'" tag="a" class=" blue" v-html="textList.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>{{textList.piu||'--'}}</span>
<span>
<router-link v-if="textList.piu" :to="'/company/' + encodeStr(textList.piuId) + '/?index=true'" tag="a" class=" blue" v-html="textList.piu"></router-link>
<template v-else>--</template>
</span>
</div>
</div>
<div class="content main5">
......@@ -183,6 +189,7 @@
name: 'debtProjectDetails',
data() {
return {
encodeStr,
id: '',
tableData: [],
"pageNum": 1,
......@@ -436,6 +443,9 @@
border-bottom: 1px solid #E6E9F0;
padding-left: 12px;
font-size: 12px;
.blue{
color: #0081FF;
}
}
span:last-child {
......
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