Skip to content

D
dsk-cr20g
Commit 9cc7f474 authored by MyName's avatar MyName
Browse files
Options

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

parents 2c57ea93 d3e43bec
Hide whitespace changes
Inline Side-by-side
Showing with 25688 additions and 79 deletions
dsk-operate-ui/src/assets/json/dataRegion.json 0 → 100644
View file @ 9cc7f474
This source diff could not be displayed because it is too large. You can view the blob instead.
dsk-operate-ui/src/assets/styles/sidebar.scss
View file @ 9cc7f474
......@@ -42,7 +42,9 @@
.el-scrollbar {
height: 100%;
}
&.has-logo {
.el-scrollbar {
......@@ -61,55 +63,82 @@
}
.svg-icon {
margin-right: 16px;
margin-right: 6px;
}
.el-submenu__icon-arrow{
top: 54%;
right: 5px;
color: #d8d8d8;
}
.el-menu {
border: none;
height: 100%;
width: 100% !important;
width: calc(100% - 16px) !important;
margin: 0 8px;
}
.el-menu--inline{
margin: 0;
width: 100%!important;
}
.el-menu--inline .nest-menu .el-menu-item{
width: 100%!important;
min-width: 128px;
color: #fff!important;
}
.el-menu-item, .el-submenu__title {
height: 40px;
line-height: 40px;
border: 1px solid #141b2f;
color: #fff;
margin-bottom: 6px;
padding: 0 6px!important;
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
}
// menu hover
.submenu-title-noDropdown,
.el-submenu__title {
&:hover {
background-color: rgba(0, 0, 0, 0.06) !important;
}
}
& .theme-dark .is-active > .el-submenu__title {
color: $base-menu-color-active !important;
}
& .nest-menu .el-submenu>.el-submenu__title,
& .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important;
&:hover {
background-color: rgba(0, 0, 0, 0.06) !important;
}
}
& .theme-dark .nest-menu .el-submenu>.el-submenu__title,
& .theme-dark .el-submenu .el-menu-item {
background-color: $base-sub-menu-background !important;
&:hover {
background-color: $base-sub-menu-hover !important;
}
}
.el-menu-item.is-active {
// 点击菜单的颜色
background-color: #1e2c4c!important;
color: #fff!important;
border-radius: 10px;
border: 1px solid #2b3f69;
&:hover {
background-color: #1e2c4c!important;
border-radius: 10px;
color: #fff!important;
border: 1px solid #2b3f69;
}
}
// menu hover
.submenu-title-noDropdown, .el-submenu__title {
color: #fff!important;
&:hover {
background-color: #1e2c4c!important;
color: #fff!important;
border-radius: 10px;
border: 1px solid #2b3f69;
}
}
}
.sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover {
background-color: #1e2c4c!important;
color: #fff!important;
border-radius: 10px;
border: 1px solid #2b3f69;
}
.hideSidebar {
.sidebar-container {
width: 54px !important;
width: 48px !important;
}
.main-container {
......@@ -117,14 +146,25 @@
}
.submenu-title-noDropdown {
padding: 0 !important;
margin-bottom: 6px;
padding: 0 6px!important;
text-align: center;
cursor: pointer;
position: relative;
.el-tooltip {
padding: 0 !important;
.svg-icon {
margin-left: 20px;
margin: 0px!important;
width: 1em;
height: 1em;
font-size: 16px;
margin-bottom: -2px;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
}
}
......@@ -133,10 +173,21 @@
overflow: hidden;
&>.el-submenu__title {
padding: 0 !important;
margin-bottom: 6px;
padding: 0 6px!important;
text-align: center;
cursor: pointer;
.svg-icon {
margin-left: 20px;
margin: 0px!important;
width: 1em;
height: 1em;
font-size: 16px;
margin-bottom: -2px;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
margin-left: 0px;
}
}
......
dsk-operate-ui/src/assets/styles/variables.scss
View file @ 9cc7f474
......@@ -36,7 +36,13 @@ $base-sub-menu-background:#000c17;
$base-sub-menu-hover:#001528;
*/
$base-sidebar-width: 200px;
// 央企颜色设置自定义
$base-menu-background:#141b2f;
$base-menu-light-background: #fff; // 选中菜单的字体颜色
$base-logo-light-title-color: #fff; // 对应base-logo-title-color
$base-sidebar-width: 144px;
//系统默认颜色
$systemColor:#0081FF;
......
dsk-operate-ui/src/layout/components/AppMain.vue
View file @ 9cc7f474
......@@ -43,6 +43,7 @@ export default {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
background: #F5F5F5;
}
.fixed-header + .app-main {
......
dsk-operate-ui/src/layout/components/Sidebar/Logo.vue
View file @ 9cc7f474
......@@ -55,9 +55,10 @@ export default {
.sidebar-logo-container {
position: relative;
width: 100%;
height: 50px;
line-height: 50px;
background: #2b2f3a;
height: 55px;
line-height: 55px;
background: #141b2f;
border-bottom: 1px solid #1a2743;
text-align: center;
overflow: hidden;
......@@ -66,8 +67,8 @@ export default {
width: 100%;
& .sidebar-logo {
width: 32px;
height: 32px;
width: 16px;
height: 23px;
vertical-align: middle;
margin-right: 12px;
}
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 9cc7f474
<template>
<div class="app-container">
区域融资
<div>
专项债项目
</div>
<div>
项目明细
</div>
</div>
</template>
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ 9cc7f474
<template>
<div class="app-container container-box">
<div class="app-container container-box nationalEconomies">
<div class="flex-box query-box">
<div class="flex-box query-params">
<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="querySubmit">
<el-select v-model="queryParams.year" filterable multiple collapse-tags class="form-content-width" placeholder="请选择年度" @change="querySubmit">
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item prop="area">
<el-select v-model="queryParams.area" filterable class="form-content-width" placeholder="请选择地区" @change="querySubmit">
<el-option v-for="(item, index) in areaOptions" :key="index" :label="item.name" :value="item.value" />
</el-select>
<el-cascader
ref="address"
:options="addressList"
:props="props"
v-model="queryParams.address"
@change="querySubmit"
placeholder="地区选择"
collapse-tags
clearable></el-cascader>
</el-form-item>
</el-form>
</div>
......@@ -30,35 +36,63 @@
fit
highlight-current-row
>
<el-table-column label="序号" width="60" align="left">
<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="地区" min-width="70" align="left">
<el-table-column label="地区" min-width="60" align="left" fixed>
<template slot-scope="scope">
<router-link to="" tag="a" class="a-link">{{ scope.row.address || '广东省' }}</router-link>
</template>
</el-table-column>
<el-table-column label="年度明细" prop="dataId" width="100" align="left">
<el-table-column label="年度明细" prop="dataId" width="90" align="left" fixed>
<template slot-scope="scope">
<img src="@/assets/images/icon_detailed.png" class="icon-detailed" @click="handleDetail(scope.row)">
</template>
</el-table-column>
<el-table-column label="GDP（元）" prop="dataId" sortable min-width="120" align="right" />
<el-table-column label="GDP增速" prop="cgrdm" min-width="90" align="right" />
<el-table-column label="人均GDP（元）" prop="cgrssqy" min-width="130" align="right" />
<el-table-column label="固定资产投资（亿元）" prop="cgrzyhy" min-width="130" align="right" />
<el-table-column label="金融机构存款余额-本外币（亿元）" prop="cgzzxs" min-width="160" align="right" />
<el-table-column label="一般公共预算收入 (亿元)" prop="cgfs" width="130" align="left" />
<el-table-column label="一般公共预算收入增速" width="140" align="left">
<el-table-column label="GDP（元）" prop="dataId" sortable min-width="115" align="right" />
<el-table-column label="GDP增速" prop="cgrdm" sortable min-width="100" align="right" />
<el-table-column label="人均GDP（元）" prop="cgrssqy" sortable width="125" align="right" />
<el-table-column label="人口（万人）" prop="cgrssqy" sortable width="120" align="right" />
<el-table-column label="一般公共预算收入 (亿元)" prop="cgrzyhy" sortable width="170" align="right" />
<el-table-column label="一般公共预算收入增速（%）" prop="cgzzxs" sortable min-width="140" align="right" />
<el-table-column label="一般公共预算支出（亿元）" prop="cgfs" sortable width="140" align="left" />
<el-table-column label="政府性基金收入（亿元）" width="140" sortable align="left">
<template slot-scope="scope">
<router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>
</template>
</el-table-column>
<el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
<el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
<el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
<el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
<el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
<el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="cgfs" sortable width="150" align="left" />
<el-table-column label="政府性基金支出（亿元）" prop="cgfs" width="170" sortable align="left" />
<el-table-column label="国有资产经营收入（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="国有资产经营支出（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="固定资产投资（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="财政自给率（%）" prop="cgfs" width="160" align="left" />
<el-table-column label="地方政府债务余额（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="一般债余额（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="专项债余额（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="地方政府债务限额（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="城投平台有息债务？？（亿元）" prop="cgfs" width="160" align="left" >
<!--<template slot="header" slot-scope="scope">-->
<!--<el-input-->
<!--v-model="search"-->
<!--size="mini"-->
<!--placeholder="输入关键字搜索"/>-->
<!--</template>-->
</el-table-column>
<el-table-column label="负债率（%）" prop="cgfs" width="160" align="left" />
<el-table-column label="负债率（宽口径）（%）" prop="cgfs" width="160" align="left" />
<el-table-column label="债务率（%）" prop="cgfs" width="160" align="left" />
<el-table-column label="债务率（宽口径）（%）" prop="cgfs" width="160" align="left" />
<el-table-column label="金融机构存款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="金融机构贷款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="第一产业增加值（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="第二产业增加值（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="第三产业增加值（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="工业增加值（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="工业总产值（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="进出口总额（亿美元）" prop="cgfs" width="160" align="left" />
<el-table-column label="社会消费品零售总额（亿元）" prop="cgfs" width="160" align="left" />
<el-table-column label="城镇居民人均可支配收入（元）" prop="cgfs" width="160" align="left" />
</el-table>
</div>
<div class="pagination-box">
......@@ -70,8 +104,9 @@
<script>
import { browsedIndexPage } from '@/api/nationalEconomies'
import dataRegion from '@/assets/json/dataRegion'
import economiesDetail from './component/economies-detail'
import axios from 'axios'
export default {
name: 'NationalEconomies',
components: {
......@@ -81,16 +116,18 @@ export default {
return {
queryParams: {
year: '',
area: ''
address: ''
},
yearOptions: [
{ name: '2022年', value: '0' },
{ name: '2023年', value: '1' }
],
areaOptions: [
{ name: '重庆', value: '0' },
{ name: '四川', value: '1' }
{ name: '2023年', value: '2023' },
{ name: '2022年', value: '2022' },
{ name: '2021年', value: '2021' },
],
props: {
value: 'id',
multiple: true,
},
addressList: [],
tableData: [],
tableLoading: false,
pageIndex: 1,
......@@ -100,20 +137,100 @@ export default {
},
created() {
this.querySubmit()
this.dataRegion()
},
methods: {
//地区
async dataRegion() {
// await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
// headers: {
// 'Content-Type': 'application/json'
// }
// }).then(res => {
// if (res.data.code == 200) {
// console.log(res.data.data)
// }
// })
var str = [];
for (let x = 0; x < 3; x++) {
for (let i = 0; i < dataRegion.length; i++) {
if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
str.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId,
"children": []
});
} else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
for (let j = 0; j < str.length; j++) {
if (str[j].id == dataRegion[i].parentId) {
str[j].children.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId,
"children": []
});
}
}
} else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
for (let j = 0; j < str.length; j++) {
for (let k = 0; k < str[j].children.length; k++) {
if (str[j].children[k].id == dataRegion[i].parentId) {
str[j].children[k].children.push({
'id': dataRegion[i].id,
"label": dataRegion[i].regionName,
"short": dataRegion[i].short,
"value": dataRegion[i].parentId
// "children":[]
});
}
}
}
}
}
}
this.addressList = str;
},
// 查询提交
async querySubmit() {
this.tableLoading = true
// this.tableLoading = true
const params = { pageIndex: this.pageIndex, pageSize: this.pageSize, browsedType: 1 }
browsedIndexPage(params).then(res => {
this.tableData = res.data.list
this.tableDataTotal = res.data.totalCount
})
// 延迟关闭加载效果
setTimeout(() => {
this.tableLoading = false
}, 200)
if(this.queryParams.address){
let arr = this.$refs.address.getCheckedNodes();
let provinceCode = [],cityCode = [],countyCode = [];
for (var i in arr) {
if (arr[i].parent) {
if (!arr[i].parent.checked) {
arr[i].hasChildren && cityCode.push(arr[i].value);
!arr[i].hasChildren && countyCode.push(arr[i].value);
}
} else {
provinceCode.push(arr[i].value)
}
}
if(provinceCode.length > 0){
params.procinceId=provinceCode.join(',')
}
if(cityCode.length > 0){
params.cityId=cityCode.join(',')
}
if(countyCode.length > 0){
params.districtId=countyCode.join(',')
}
}
console.log(params)
// browsedIndexPage(params).then(res => {
// this.tableData = res.data.list
// this.tableDataTotal = res.data.totalCount
// })
// // 延迟关闭加载效果
// setTimeout(() => {
// this.tableLoading = false
// }, 200)
},
// 明细
handleDetail(row) {
......@@ -148,4 +265,33 @@ export default {
height: 16px;
cursor: pointer;
}
.nationalEconomies{
.table-item{
::v-deep .el-table{
th{
font-size: 12px !important;
font-weight: 400 !important;
}
.el-table__fixed-header-wrapper th{
background: #F0F3FA;
}
.cell{
position: relative;
}
.caret-wrapper{
width: 10px;
/*<!--position: absolute;-->*/
/*<!--right: 12px;-->*/
/*<!--top: -3px;-->*/
}
/*.sort-caret{*/
/*position: initial;*/
/*}*/
/*.ascending{*/
/*margin-bottom: 3px;*/
/*}*/
}
}
}
</style>
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