Skip to content

D
dsk-cr20g
Commit 6d61f64a authored by danfuman's avatar danfuman
Browse files
Options

修改

parent bea319a2
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 20 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 6d61f64a
...@@ -312,7 +312,9 @@ ul, li { ...@@ -312,7 +312,9 @@ ul, li {
height: auto !important; height: auto !important;
bottom: 16px; bottom: 16px;
} }
.el-table__body tr.current-row > td.el-table__cell{
background: none;
}
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
...@@ -348,6 +350,30 @@ ul, li { ...@@ -348,6 +350,30 @@ ul, li {
background-color: #F8FBFF; background-color: #F8FBFF;
} }
} }
::-webkit-scrollbar-track-piece {
//滚动条凹槽的颜色，还可以设置边框属性
background-color: #F3F4F5;
height: 16px;
padding: 0 4px;
}
//滚动条的宽度
::-webkit-scrollbar {
width: 8px;
height: 16px;
background-color: #F3F4F5;
border-radius: 6px;
}
//滚动条的滑块
::-webkit-scrollbar-thumb {
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(98,110,126,0.2);
border: 4px solid #F3F4F5;
&:hover{
background: #566380;
}
}
} }
} }
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ 6d61f64a
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
<el-table-column label="产业类型" prop="projectType"></el-table-column> <el-table-column label="产业类型" prop="projectType"></el-table-column>
<el-table-column :label="oneYear"> <el-table-column :label="oneYear">
<el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column> <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
<el-table-column prop="rate" label="占比"> </el-table-column> <el-table-column prop="rate" label="占比（%）"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="twoYear"> <el-table-column :label="twoYear">
<el-table-column prop="lastMoney" label="金额（亿元）"> </el-table-column> <el-table-column prop="lastMoney" label="金额（亿元）"> </el-table-column>
<el-table-column prop="lastRate" label="占比" > </el-table-column> <el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -166,6 +166,7 @@ export default { ...@@ -166,6 +166,7 @@ export default {
return result return result
}, },
}, },
color:['#547FF7', '#63B6EA', '#93A1FF','#60C585','#FF956A','#F6BE5F','#946AFF','#36A860','#7781DD','#E372C6','#F7A396','#3BAAA9','#3F8DB1','#329857','#4A6DCD','#E75E5C','#BE59A4','#FFC094','#7B65DF','#FB8BA7','#CB9EFF'],
series: [ series: [
{ {
type: 'treemap', type: 'treemap',
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ 6d61f64a
...@@ -358,7 +358,6 @@ export default { ...@@ -358,7 +358,6 @@ export default {
}, },
grid: { grid: {
top:20, top:20,
// left:15,
// right:15, // right:15,
bottom:0, bottom:0,
}, },
...@@ -608,6 +607,7 @@ export default { ...@@ -608,6 +607,7 @@ export default {
}, },
grid: { grid: {
top:20, top:20,
// left:5,
bottom:0, bottom:0,
}, },
series: [ series: [
...@@ -621,7 +621,7 @@ export default { ...@@ -621,7 +621,7 @@ export default {
}, },
label: { label: {
show: true, show: true,
position: 'top' position: 'top',
}, },
//设置折线颜色和粗细 //设置折线颜色和粗细
lineStyle: { lineStyle: {
...@@ -722,6 +722,7 @@ export default { ...@@ -722,6 +722,7 @@ export default {
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-left: 22px; margin-left: 22px;
margin-bottom: -2px;
} }
} }
.item-text{ .item-text{
...@@ -754,10 +755,10 @@ export default { ...@@ -754,10 +755,10 @@ export default {
width: 20%; width: 20%;
line-height: 26px; line-height: 26px;
img{ img{
width: 12px; width: 16px;
height: 12px; height: 16px;
margin-right: 4px; margin-right: 4px;
margin-bottom: -1px; margin-bottom: -4px;
} }
label{ label{
font-weight: 700; font-weight: 700;
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 6d61f64a
...@@ -110,9 +110,9 @@ export default { ...@@ -110,9 +110,9 @@ export default {
} }
}, },
created() { created() {
location({provinceId:'500000'}).then(res => { location({}).then(res => {
this.province=res.data.currentProvince.regionName; this.province=res.data.province;
this.provinceId=res.data.currentProvince.id; this.provinceId=res.data.provinceId;
this.querySubmit() this.querySubmit()
}) })
this.aptitudeCode() this.aptitudeCode()
...@@ -159,8 +159,10 @@ export default { ...@@ -159,8 +159,10 @@ export default {
params.aptitudeQueryDto.aptitudeDtoList=aptitudeType params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
} }
enterprise(params).then(res => { enterprise(params).then(res => {
this.tableData=res.data.list; if(res.code === 200){
this.tableDataTotal=res.data.total; this.tableData=res.data.list;
this.tableDataTotal=res.data.total;
}
}) })
}, },
// 重置页数 // 重置页数
...@@ -187,6 +189,7 @@ export default { ...@@ -187,6 +189,7 @@ export default {
this.querySubmit() this.querySubmit()
}, },
handleClick(){ handleClick(){
console.log(this.activeName)
this.queryParams.codeStr=[] this.queryParams.codeStr=[]
this.aptitudeType=''; this.aptitudeType='';
this.queryParams={ this.queryParams={
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 6d61f64a
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link> <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
</template> </template>
</el-table-column> </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="155" />
<el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom" width="155" /> <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="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="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="170" />
<el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体"> <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>--> <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
...@@ -174,6 +174,7 @@ export default { ...@@ -174,6 +174,7 @@ export default {
itemWidth:12, itemWidth:12,
pageButtonPosition: 'end', pageButtonPosition: 'end',
}, },
color:['#8A82F3', '#93A1FF', '#63B6EA','#42B393','#8ECF95','#FFDC6B','#FFC08D','#FE9C77','#E8649B','#A151F5'],
series: [ series: [
{ {
type: 'pie', type: 'pie',
...@@ -310,11 +311,49 @@ export default { ...@@ -310,11 +311,49 @@ export default {
.box-right{ .box-right{
float: right; float: right;
::v-deep .el-table{ ::v-deep .el-table{
td.el-table__cell{
border-bottom: 0;
}
tr{
&.current-row>td{
background-color: initial;
}
&:nth-child(2n) {
background: #F8FBFF;
}
}
.el-table__cell{ .el-table__cell{
height: 40px; height: 40px;
padding: 0; padding: 0;
line-height: 40px; line-height: 40px;
} }
::-webkit-scrollbar-track-piece {
//滚动条凹槽的颜色，还可以设置边框属性
background-color: #F3F4F5;
height: 16px;
padding: 0 4px;
}
//滚动条的宽度
::-webkit-scrollbar {
width: 8px;
height: 8px;
background-color: #F3F4F5;
border-radius: 6px;
}
//滚动条的滑块
::-webkit-scrollbar-thumb {
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(98,110,126,0.2);
border: 4px solid rgba(98,110,126,0.2);;
&:hover{
background: #566380;
}
}
.gutter{
background: #f8f8f9;
}
} }
} }
} }
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/economies-detail.vue
View file @ 6d61f64a
...@@ -237,17 +237,15 @@ export default { ...@@ -237,17 +237,15 @@ export default {
}, },
methods: { methods: {
open(row) { open(row) {
this.dialogVisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.getDetail(row) this.getDetail(row)
}) })
}, },
// 获取明细 // 获取明细
async getDetail(row) { async getDetail(row) {
console.log(row)
getNationalDetails({id:row.id}).then(res => { getNationalDetails({id:row.id}).then(res => {
console.log(res.data)
this.tableData=res.data; this.tableData=res.data;
this.dialogVisible = true;
}) })
}, },
formatStatus: function(row, column, cellValue) { formatStatus: function(row, column, cellValue) {
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 6d61f64a
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
<el-radio label="2">本级</el-radio> <el-radio label="2">本级</el-radio>
</el-radio-group> </el-radio-group>
<div class="search-box"> <div class="search-box">
<span style="cursor: pointer;" @click="handleSearch">筛选<i class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);margin-left: 5px"></i></span> <span style="cursor: pointer;" :class="searchState ? 'color':''" @click="handleSearch">筛选
<i v-if="searchState" class="el-icon-caret-top" style="color:#0081FF;"></i>
<i v-else class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);"></i>
</span>
<div v-show="searchState" ref="showContent" class="search-main"> <div v-show="searchState" ref="showContent" class="search-main">
<div class="item"> <div class="item">
<span class="wrap_label">行政等级</span> <span class="wrap_label">行政等级</span>
...@@ -604,6 +607,9 @@ export default { ...@@ -604,6 +607,9 @@ export default {
/*cursor: pointer;*/ /*cursor: pointer;*/
color:#232323; color:#232323;
position: relative; position: relative;
.color{
color:#0081FF;
}
.search-main{ .search-main{
background: #ffffff; background: #ffffff;
box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1); box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
...@@ -635,6 +641,11 @@ export default { ...@@ -635,6 +641,11 @@ export default {
cursor: pointer; cursor: pointer;
margin-right: 8px; margin-right: 8px;
} }
span:hover{
background: #F3F4F5;
border-radius: 4px;
color:#232323;
}
.color_text{ .color_text{
background: #F3F4F5; background: #F3F4F5;
border-radius: 4px; border-radius: 4px;
......
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