Skip to content

D
dsk-cr20g
Commit e7e4bd19 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 a9450ea2 e3156a27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 135 deletions
dsk-admin/src/main/resources/application-test.yml
View file @ e7e4bd19
......@@ -14,7 +14,7 @@ ruoyi:
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
captchaType: char
# 开发环境配置
server:
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ e7e4bd19
......@@ -395,6 +395,12 @@ export default {
margin-top: -5px;
}
}
.is-disabled:hover{
color: rgba(35, 35, 35, 0.8)!important;
&:before {
color: rgba(35, 35, 35, 0.8)!important;
}
}
::v-deep .el-submenu .el-menu-item{
font-size: 12px;
color: rgba(35,35,35,0.8);
......@@ -408,7 +414,7 @@ export default {
left: 21px;
width: 2px;
height: 2px;
background: rgba(35,35,35,0.8);
background: #0081FF;
border-radius: 50%;
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ e7e4bd19
......@@ -316,7 +316,17 @@ export default {
::v-deep .el-table .el-table__body-wrapper tr:nth-child(2n){
background: #FFFFFF;
}
::v-deep .el-table .el-table__body-wrapper tr:nth-child(5) .el-table__cell{
border: none;
}
::v-deep .el-table::before{
display: none;
}
}
}
}
::deep .el-table::before{
display: none;
}
</style>
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ e7e4bd19
......@@ -336,7 +336,9 @@ export default {
'path':'business'
} ,
})
this.$router.go(0)
this.$nextTick(()=>{
this.$tab.refreshPage();
})
// 跳转地址
},
renHide(){
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ e7e4bd19
......@@ -4,7 +4,7 @@
<div class="content_item">
<div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入企业名称关键字" v-model="keys" >
<div slot="append" class="btn-search" @click="search">搜索</div>
<div slot="append" class="btn-search" @click="search()">搜索</div>
</el-input>
</div>
......@@ -623,9 +623,10 @@ export default {
methods: {
scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>400){
let top = scrollTop-401
let el1 = document.getElementsByClassName("el-table")[0]
let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>el1.offsetTop){
let top = scrollTop-el1.offsetTop-13
el.style.top = top+'px'
}else{
el.style.top = 0
......@@ -832,11 +833,10 @@ export default {
creditCode:info.creditCode,
}
api.claim(params).then(res1=>{
// console.log(res)
if (res1.code==200) {
this.dialogVisible=true;
this.customerId=res1.data.customerId;
}
if (res1.code==200) {
this.dialogVisible=true;
this.customerId=res1.data.customerId;
}
}).catch(error=>{
});
......@@ -868,6 +868,8 @@ export default {
} ,
})
this.dialogVisible=false;
this.search();
},
search(pageNum, pageSize,exportFlag) {
this.dialogVisible=false;
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ e7e4bd19
......@@ -5,7 +5,7 @@
<div class="content_item content_item_padding0">
<div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<div slot="append" class="btn-search" @click="search">搜索</div>
<div slot="append" class="btn-search" @click="search()">搜索</div>
</el-input>
<!-- <template v-if="ename">
<span v-for=" (item,k) in enameQueryTypeList" :key="k" style="margin-right: 24px;">
......@@ -99,7 +99,7 @@
<template v-else>
<el-popover placement="top-start" width="200" trigger="hover">
<div class="select-popper-title">
请先选择<span class="colorhover">进省备案</span>后,在选择本省与进省企业!
请先选择<span class="colorhover">进省备案</span>后，再选择本省与进省企业！
</div>
<div class="" slot="reference">
......@@ -554,7 +554,6 @@
</template>
</p>
<p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)" style="padding: 10px 0px 0px 0px;">
<
<span class="right-title-grey">曾用名：</span>
<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
</p>
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ e7e4bd19
......@@ -7,6 +7,7 @@
<div style="position:relative" v-for="(itme,i) in personnelList"
:class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)">
<p>{{itme.value}}</p>
<img v-if="i==1" style="position: absolute;top:-10px;" src="@/assets/images/owner/tip.png" alt="">
</div>
</div>
......@@ -39,12 +40,12 @@
personnelList: [{
key: 'Owner',
status: true,
value: '查业主单位',
value: '查城投平台',
},
{
key: 'SearchEnterprise',
status: false,
value: '查建筑企业',
value: '查企业',
},
],
......
dsk-operate-ui/src/views/macro/economies/component/comparison.vue
View file @ e7e4bd19
......@@ -666,6 +666,19 @@ export default {
/*}*/
/*}*/
}
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
.table-title{
/*width: 100%;*/
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ e7e4bd19
......@@ -20,7 +20,7 @@
<div id="echarts" style="height: 400px"></div>
<p class="tips"> 注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
</div>
<div class="content-right">
<div class="content-right table-item">
<el-table
v-loading="tableLoading"
:data="tableData"
......@@ -283,6 +283,37 @@ export default {
z-index: 0;
top: 46px;
}
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
.has-gutter{
tr{
th:nth-child(4){
border-right:0;
.cell{
padding-right: 24px !important;
}
}
td:nth-child(6){
border-right:0;
}
}
}
.el-table__cell.gutter{
background: #F5F7FA;
width: 16px !important;
border-top: 1px solid #dfe6ec;
}
}
}
}
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ e7e4bd19
......@@ -6,7 +6,7 @@
<span class="common-title">经济数据</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getData">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="changeSelect">
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select>
</el-form-item>
......@@ -102,14 +102,13 @@ export default {
if(this.queryParams.order){
params.order=this.queryParams.order
}
if(this.provinceId.length >= 0){
if(this.provinceId.length > 0){
params.provinceIds=[this.provinceId[0]]
}
if(this.provinceId.length >= 1){
if(this.provinceId.length > 1){
params.cityId=[this.provinceId[1]]
}
if(this.provinceId.length >= 2){
if(this.provinceId.length > 2){
params.areaId=[this.provinceId[2]]
}
// params.provinceIds=[this.dataQuery.provinceId]
......@@ -118,6 +117,10 @@ export default {
this.tableDataTotal = res.data.totalCount
})
},
changeSelect(){
this.pageIndex=1
this.getData()
},
// 重置页数
handleSizeChange(val) {
this.pageIndex = 1
......@@ -199,6 +202,21 @@ export default {
}
.table-item{
margin-top: 22px;
::v-deep .el-table{
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
}
}
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ e7e4bd19
......@@ -11,8 +11,8 @@
<img v-else src="@/assets/images/economies/icon_down.png">
</div>
<div id="echartsGDP" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.gdpGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toString().substring(1)}}%</span></div>
<div class="item-text up" v-if="Number(recentlyYear.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
</div>
<div class="item">
<div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
......@@ -22,8 +22,8 @@
<img v-else src="@/assets/images/economies/icon_down.png">
</div>
<div id="echartsZS" style="height: 75px;"></div>
<div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
<div class="item-text up" v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toFixed(2).toString().substring(1)}}%</span></div>
</div>
<div class="item">
<div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
......@@ -33,8 +33,8 @@
<img v-else src="@/assets/images/economies/icon_down.png">
</div>
<div id="echartsRK" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.populationGrowthRate > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.populationGrowthRate}}%</span></div>
<div class="item-text up" v-if="Number(recentlyYear.populationGrowthRate) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationGrowthRate).toFixed(2).toString().substring(1)}}%</span></div>
</div>
<div class="item">
<div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
......@@ -44,8 +44,8 @@
<img v-else src="@/assets/images/economies/icon_down.png">
</div>
<div id="echartsSR" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.gbrGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toString().substring(1)}}%</span></div>
<div class="item-text up" v-if="Number(recentlyYear.gbrGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toFixed(2).toString().substring(1)}}%</span></div>
</div>
<div class="item">
<div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
......@@ -55,7 +55,7 @@
<img v-else src="@/assets/images/economies/icon_down.png">
</div>
<div id="echartsYE" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance">
<div class="item-text up" v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))">
较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
</div>
......@@ -669,6 +669,12 @@ export default {
fontWeight: 'bold'
}
}
if(row.row.title === '指标'){
return {
background: '#F0F3FA',
color:'#4C4D4E',
}
}
},
handleMessage(){
this.$message({
......@@ -816,11 +822,21 @@ export default {
}
.table-item{
margin-top: 22px;
/*::v-deep .el-table {*/
/*td.el-table__cell {*/
/*border-bottom: 0;*/
/*}*/
/*}*/
::v-deep .el-table{
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
}
}
</style>
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ e7e4bd19
......@@ -135,7 +135,23 @@ export default {
this.aptitudeCode()
},
mounted() {
// window.addEventListener("scroll",this.scrolling)
},
beforeDestroy() {
// window.removeEventListener("scroll", this.scrolling);
},
methods: {
scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>135){
let top = scrollTop-138
el.style.top = top+'px'
}else{
el.style.top = 0
}
},
//资质Json
async aptitudeCode() {
// await axios.post("https://files.jiansheku.com/file/json/common/aptitudeCode.json", {}, {
......@@ -405,6 +421,15 @@ export default {
}
}
::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
z-index: 9;
}
th{
font-size: 12px !important;
font-weight: 400 !important;
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ e7e4bd19
......@@ -431,7 +431,7 @@ export default {
display: flex;
justify-content: space-between;
.box-left{
width: 55%;
width: 50%;
}
.empty{
margin: 0 auto;
......@@ -509,6 +509,9 @@ export default {
padding: 0;
line-height: 40px;
}
.el-table__body tr:hover > td.el-table__cell{
background: #DCEBFF;
}
::-webkit-scrollbar-track-piece {
//滚动条凹槽的颜色，还可以设置边框属性
background-color: #F3F4F5;
......@@ -538,6 +541,9 @@ export default {
th:nth-child(4){
border-right:0;
}
td:nth-child(4){
border-right:0;
}
}
}
.el-table__cell.gutter{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ e7e4bd19
......@@ -6,7 +6,7 @@
<span class="common-title">全国经济大全</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch" :popper-append-to-body='false'>
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select>
</el-form-item>
......@@ -31,11 +31,11 @@
<div class="table-item">
<el-table
v-loading="tableLoading"
class="fixed-table"
:data="tableData"
element-loading-text="Loading"
@sort-change="sortChange"
border
fit
highlight-current-row
v-if="tableDataTotal > 0"
:default-sort = "{prop: 'gdp', order: 'descending'}"
......@@ -57,9 +57,9 @@
<el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
<el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
<el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
<el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" :formatter="formatStatus" width="170" align="right"></el-table-column>
<el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
<el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
<el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" :formatter="formatStatus" width="180" align="right"></el-table-column>
<el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="150" align="right"></el-table-column>
<el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="150" align="right"></el-table-column>
<el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
<el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
<el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column>
......@@ -150,7 +150,23 @@
this.dataRegion()
this.getYears()
},
mounted() {
window.addEventListener("scroll",this.scrolling)
},
beforeDestroy() {
window.removeEventListener("scroll", this.scrolling);
},
methods: {
scrolling() {
// let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
// let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
// if (scrollTop>135){
// let top = scrollTop-136
// el.style.top = top+'px'
// }else{
// el.style.top = 0
// }
},
getYears(){
getYears({}).then(res => {
this.yearOptions=res.data.reverse();
......@@ -322,6 +338,7 @@
</script>
<style lang="scss" scoped>
.qgjjdq{
.query-box{
margin: -8px 0 8px 0;
......@@ -346,13 +363,18 @@
}
}
}
::v-deep .el-select-dropdown{
.el-select-dropdown__item.hover{
color: #0081FF;
}
}
.content{
background: #ffffff;
padding: 16px;
margin-top: 12px;
/*height: calc(100vh - 300px);*/
.table-item{
position: relative;
/*position: relative;*/
.empty{
/*position: absolute;*/
/*top: 50%;*/
......@@ -379,6 +401,15 @@
}
}
::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
z-index: 9;
}
th{
font-size: 12px !important;
font-weight: 400 !important;
......@@ -393,6 +424,9 @@
width: 10px;
}
}
::v-deep .fixed-table{
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ e7e4bd19
......@@ -610,6 +610,19 @@ export default {
}
}
}
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ e7e4bd19
......@@ -557,7 +557,7 @@ export default {
grid: {
top:20,
left:65,
right:30,
right:50,
bottom:20,
},
series: [
......@@ -829,6 +829,19 @@ export default {
}
}
}
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
td.el-table__cell{
border-bottom: 0;
}
.caret-wrapper{
width: 10px;
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ e7e4bd19
<template>
<div class="app-container container-box nationalEconomies">
<div class="app-container nationalEconomies">
<div class="header">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
......@@ -7,6 +7,7 @@
<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
</el-tabs>
</div>
<Economic v-if="activeName === 'first'"></Economic>
<ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
<ZhongBiao v-if="activeName === 'third'"></ZhongBiao>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ e7e4bd19
......@@ -98,7 +98,7 @@
{{textList.projectDuration}}天
</template>
<template v-else>
'--'
--
</template>
</span>
<label class="label">项目属地</label>
......@@ -195,12 +195,12 @@
<p>
<label class="label">招标人联系方式</label>
<span>{{textList.tendereeTel||'--'}}</span>
<label class="label">招标人联系地址</label>
<span>{{textList.tendereeAddress||'--'}}</span>
</p>
<p>
<label class="label">代理机构联系方式</label>
<span>{{textList.agencyTel||'--'}}</span>
</p>
<p>
<label class="label">招标人联系地址</label>
<span>{{textList.tendereeAddress||'--'}}</span>
<label class="label">代理机构联系地址</label>
<span>{{textList.agencyAddress||'--'}}</span>
</p>
......
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