Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
23581658
Commit
23581658
authored
Jul 21, 2023
by
yht15023815643
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
df00898d
41621069
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
166 additions
and
38 deletions
+166
-38
ScrollPane.vue
dsk-operate-ui/src/layout/components/TagsView/ScrollPane.vue
+1
-1
index.vue
dsk-operate-ui/src/layout/components/TagsView/index.vue
+92
-1
skeleton.vue
dsk-operate-ui/src/views/macro/component/skeleton.vue
+29
-0
industrialStructure.vue
...c/views/macro/economies/component/industrialStructure.vue
+2
-2
regionalEconomy.vue
...i/src/views/macro/economies/component/regionalEconomy.vue
+16
-16
index.vue
dsk-operate-ui/src/views/macro/enterprises/index.vue
+8
-5
qgjjdq.vue
...ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
+9
-7
index.vue
dsk-operate-ui/src/views/macro/urban/index.vue
+9
-6
No files found.
dsk-operate-ui/src/layout/components/TagsView/ScrollPane.vue
View file @
23581658
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
height
:
100%
;
height
:
100%
;
padding-top
:
24px
;
padding-top
:
24px
;
margin-bottom
:
0
!
important
;
margin-bottom
:
0
!
important
;
overflow
:
auto
;
overflow
:
hidden
;
}
}
.is-horizontal
{
.is-horizontal
{
width
:
0
;
width
:
0
;
...
...
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @
23581658
...
@@ -28,6 +28,26 @@
...
@@ -28,6 +28,26 @@
<li
v-if=
"!isLastView()"
@
click=
"closeRightTags"
><i
class=
"el-icon-right"
></i>
关闭右侧
</li>
<li
v-if=
"!isLastView()"
@
click=
"closeRightTags"
><i
class=
"el-icon-right"
></i>
关闭右侧
</li>
<li
@
click=
"closeAllTags(selectedTag)"
><i
class=
"el-icon-circle-close"
></i>
全部关闭
</li>
<li
@
click=
"closeAllTags(selectedTag)"
><i
class=
"el-icon-circle-close"
></i>
全部关闭
</li>
</ul>
</ul>
<div
class=
"alltags"
@
click=
"closeall"
>
<div
class=
""
><i
class=
"el-icon-arrow-down"
v-if=
"!showall"
></i>
<i
class=
"el-icon-arrow-up"
v-if=
"showall"
></i></div>
<div
class=
"tagslist"
v-if=
"showall"
>
<router-link
v-for=
"(tag, index) in visitedViews"
ref=
"tag"
:key=
"tag.path"
:class=
"isActive(tag)?'active':''"
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
<i
class=
"el-icon-check"
></i>
<span
:id=
"isActive(tag)?'tagTitle':''"
>
{{
tag
.
title
}}
</span>
</router-link>
<div
class=
"clasall"
@
click=
"closeAllTag(selectedTag)"
>
关闭全部标签
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -43,7 +63,8 @@ export default {
...
@@ -43,7 +63,8 @@ export default {
top
:
0
,
top
:
0
,
left
:
0
,
left
:
0
,
selectedTag
:
{},
selectedTag
:
{},
affixTags
:
[]
affixTags
:
[],
showall
:
false
,
}
}
},
},
computed
:
{
computed
:
{
...
@@ -90,6 +111,13 @@ export default {
...
@@ -90,6 +111,13 @@ export default {
this
.
addTags
()
this
.
addTags
()
},
},
methods
:
{
methods
:
{
closeall
(){
if
(
this
.
showall
==
true
){
this
.
showall
=
false
}
else
{
this
.
showall
=
true
}
},
isActive
(
route
)
{
isActive
(
route
)
{
return
route
.
path
===
this
.
$route
.
path
return
route
.
path
===
this
.
$route
.
path
},
},
...
@@ -202,6 +230,11 @@ export default {
...
@@ -202,6 +230,11 @@ export default {
this
.
moveToCurrentTag
()
this
.
moveToCurrentTag
()
})
})
},
},
closeAllTag
(
view
){
this
.
showall
=
false
this
.
closeAllTags
(
view
)
},
closeAllTags
(
view
)
{
closeAllTags
(
view
)
{
this
.
$tab
.
closeAllPage
().
then
(({
visitedViews
})
=>
{
this
.
$tab
.
closeAllPage
().
then
(({
visitedViews
})
=>
{
if
(
this
.
affixTags
.
some
(
tag
=>
tag
.
path
===
this
.
$route
.
path
))
{
if
(
this
.
affixTags
.
some
(
tag
=>
tag
.
path
===
this
.
$route
.
path
))
{
...
@@ -257,6 +290,7 @@ export default {
...
@@ -257,6 +290,7 @@ export default {
height
:
56px
;
height
:
56px
;
width
:
100%
;
width
:
100%
;
background
:
#fff
;
background
:
#fff
;
position
:
relative
;
.tags-view-wrapper
{
.tags-view-wrapper
{
.tags-view-item
{
.tags-view-item
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -336,6 +370,63 @@ export default {
...
@@ -336,6 +370,63 @@ export default {
}
}
}
}
}
}
.alltags
{
position
:
absolute
;
align-items
:
center
;
border-radius
:
9px
;
height
:
17px
;
justify-content
:
center
;
width
:
36px
;
right
:
-46px
;
bottom
:
10px
;
cursor
:
pointer
;
text-align
:
center
;
&
:hover
{
background
:
#EFEFEF
;
}
.tagslist
{
position
:
absolute
;
right
:
0
;
top
:
20px
;
background-color
:
#fcfcfc
;
color
:
#141414
;
font-size
:
13px
;
line-height
:
1em
;
margin-bottom
:
0
;
max-height
:
450px
;
overflow-y
:
auto
;
overflow-y
:
overlay
;
padding
:
20px
0
10px
;
width
:
325px
;
text-align
:
left
;
box-shadow
:
0
2px
9px
2px
rgba
(
0
,
0
,
0
,.
09
)
,
0
1px
2px
-2px
rgba
(
0
,
0
,
0
,.
16
);
.tags-view-item
{
padding
:
8px
24px
;
display
:
block
;
position
:
relative
;
&
:hover
{
color
:
#0081FF
;
}
.el-icon-check
{
display
:
none
;
position
:
absolute
;
left
:
5px
;
width
:
13px
;
}
&
.active
{
color
:
#0081FF
;
.el-icon-check
{
display
:
block
;
}
}
}
.clasall
{
border-top
:
1px
solid
#EFEFEF
;
padding
:
10px
24px
0
;
margin-top
:
10px
;
}
}
}
}
}
</
style
>
</
style
>
...
...
dsk-operate-ui/src/views/macro/component/skeleton.vue
0 → 100644
View file @
23581658
<
template
>
<el-skeleton
animated
>
<template
slot=
"template"
>
<el-skeleton-item
variant=
"text"
style=
"width: 60%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 60%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
<el-skeleton-item
variant=
"text"
style=
"width: 100%;"
/>
</
template
>
</el-skeleton>
</template>
<
script
>
export
default
{
name
:
'skeleton'
}
</
script
>
<
style
lang=
"scss"
scoped
>
.el-skeleton__item
{
height
:
20px
;
border-radius
:
0
;
margin
:
9px
0
;
background
:
#f0f0f0
;
}
</
style
>
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @
23581658
...
@@ -164,9 +164,9 @@ export default {
...
@@ -164,9 +164,9 @@ export default {
list
.
push
(
item
);
list
.
push
(
item
);
}
}
this
.
data
=
list
;
this
.
data
=
list
;
if
(
list
.
length
>
0
){
//
if(list.length > 0){
this
.
initChart
()
this
.
initChart
()
}
//
}
}
}
})
})
},
},
...
...
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @
23581658
...
@@ -7,57 +7,57 @@
...
@@ -7,57 +7,57 @@
<div
class=
"item-title"
><i
style=
"background: #4E8EFF;"
></i>
{{
recentlyYear
.
year
}}
年GDP
</div>
<div
class=
"item-title"
><i
style=
"background: #4E8EFF;"
></i>
{{
recentlyYear
.
year
}}
年GDP
</div>
<div
class=
"item-count"
>
<div
class=
"item-count"
>
<span>
{{
recentlyYear
.
gdp
}}
</span>
亿
<span>
{{
recentlyYear
.
gdp
}}
</span>
亿
<img
v-if=
"Number(
getMoneyNum(recentlyYear.gdpGrowth)
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-if=
"Number(
recentlyYear.gdpCompare
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
</div>
</div>
<div
id=
"echartsGDP"
style=
"height: 75px;"
></div>
<div
id=
"echartsGDP"
style=
"height: 75px;"
></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.gdp
Growth) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
gdpGrowth
}}
%
</span></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.gdp
Compare) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
gdpCompare
}}
亿
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gdp
Growth
).
toFixed
(
2
).
toString
().
substring
(
1
)
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gdp
Compare
).
toString
().
substring
(
1
)
}}
亿
</span></div>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<div
class=
"item-title"
><i
style=
"background: #718AFF;"
></i>
{{
recentlyYear
.
year
}}
年GDP增速
</div>
<div
class=
"item-title"
><i
style=
"background: #718AFF;"
></i>
{{
recentlyYear
.
year
}}
年GDP增速
</div>
<div
class=
"item-count"
>
<div
class=
"item-count"
>
<span>
{{
recentlyYear
.
gdpGrowth
}}
</span>
%
<span>
{{
recentlyYear
.
gdpGrowth
}}
</span>
%
<img
v-if=
"
(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-if=
"
Number(recentlyYear.gdpGrowthCompare
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
</div>
</div>
<div
id=
"echartsZS"
style=
"height: 75px;"
></div>
<div
id=
"echartsZS"
style=
"height: 75px;"
></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 up"
v-if=
"
Number(recentlyYear.gdpGrowthCompare
) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
gdpGrowthCompare
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gdpGrowthCompare
).
to
Fixed
(
2
).
to
String
().
substring
(
1
)
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gdpGrowthCompare
).
toString
().
substring
(
1
)
}}
%
</span></div>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<div
class=
"item-title"
><i
style=
"background: #3AD0D1;"
></i>
{{
recentlyYear
.
year
}}
年人口
</div>
<div
class=
"item-title"
><i
style=
"background: #3AD0D1;"
></i>
{{
recentlyYear
.
year
}}
年人口
</div>
<div
class=
"item-count"
>
<div
class=
"item-count"
>
<span>
{{
recentlyYear
.
population
}}
</span>
万
<span>
{{
recentlyYear
.
population
}}
</span>
万
<img
v-if=
"Number(
getMoneyNum(recentlyYear.populationGrowthRate)
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-if=
"Number(
recentlyYear.populationCompare
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
</div>
</div>
<div
id=
"echartsRK"
style=
"height: 75px;"
></div>
<div
id=
"echartsRK"
style=
"height: 75px;"
></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.population
GrowthRate) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
populationGrowthRate
}}
%
</span></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.population
Compare) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
populationCompare
}}
万
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
population
GrowthRate
).
toFixed
(
2
).
toString
().
substring
(
1
)
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
population
Compare
).
toString
().
substring
(
1
)
}}
万
</span></div>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<div
class=
"item-title"
><i
style=
"background: #FFBE5D;"
></i>
{{
recentlyYear
.
year
}}
年一般公共预算收入
</div>
<div
class=
"item-title"
><i
style=
"background: #FFBE5D;"
></i>
{{
recentlyYear
.
year
}}
年一般公共预算收入
</div>
<div
class=
"item-count"
>
<div
class=
"item-count"
>
<span>
{{
recentlyYear
.
gbr
}}
</span>
亿
<span>
{{
recentlyYear
.
gbr
}}
</span>
亿
<img
v-if=
"Number(
getMoneyNum(recentlyYear.gbrGrowth)
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-if=
"Number(
recentlyYear.gbrCompare
) > 0"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
</div>
</div>
<div
id=
"echartsSR"
style=
"height: 75px;"
></div>
<div
id=
"echartsSR"
style=
"height: 75px;"
></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.gbr
Growth) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
gbrGrowth
}}
%
</span></div>
<div
class=
"item-text up"
v-if=
"Number(recentlyYear.gbr
Compare) > 0"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
gbrCompare
}}
亿
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gbr
Growth
).
toFixed
(
2
).
toString
().
substring
(
1
)
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
gbr
Compare
).
toString
().
substring
(
1
)
}}
亿
</span></div>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<div
class=
"item-title"
><i
style=
"background: #FF8935;"
></i>
{{
recentlyYear
.
year
}}
年地方政府债务余额
</div>
<div
class=
"item-title"
><i
style=
"background: #FF8935;"
></i>
{{
recentlyYear
.
year
}}
年地方政府债务余额
</div>
<div
class=
"item-count"
>
<div
class=
"item-count"
>
<span>
{{
recentlyYear
.
govDebtBalance
}}
</span>
亿
<span>
{{
recentlyYear
.
govDebtBalance
}}
</span>
亿
<img
v-if=
"Number(
getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))
"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-if=
"Number(
recentlyYear.govDebtBalanceCompare) > 0
"
src=
"@/assets/images/economies/icon_up.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
<img
v-else
src=
"@/assets/images/economies/icon_down.png"
>
</div>
</div>
<div
id=
"echartsYE"
style=
"height: 75px;"
></div>
<div
id=
"echartsYE"
style=
"height: 75px;"
></div>
<div
class=
"item-text up"
v-if=
"Number(
getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))
"
>
<div
class=
"item-text up"
v-if=
"Number(
recentlyYear.govDebtBalanceCompare) > 0
"
>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
govDebtBalanceCompare
}}
%
</span></div>
较
{{
nextYearMap
.
year
}}
年上升
<span>
{{
recentlyYear
.
govDebtBalanceCompare
}}
亿
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
recentlyYear
.
govDebtBalanceCompare
}}
%
</span></div>
<div
class=
"item-text down"
v-else
>
较
{{
nextYearMap
.
year
}}
年下降
<span>
{{
Number
(
recentlyYear
.
govDebtBalanceCompare
).
toString
().
substring
(
1
)
}}
亿
</span></div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @
23581658
...
@@ -24,16 +24,16 @@
...
@@ -24,16 +24,16 @@
</el-input>
</el-input>
<span
class=
"total"
>
共
{{
tableDataTotal
}}
条
</span>
<span
class=
"total"
>
共
{{
tableDataTotal
}}
条
</span>
</div>
</div>
<skeleton
v-if=
"isSkeleton"
style=
"padding: 16px"
></skeleton>
<div
class=
"table-item"
>
<div
class=
"table-item"
>
<el-table
<el-table
v-loading=
"tableLoading"
:data=
"tableData"
:data=
"tableData"
element-loading-text=
"Loading"
element-loading-text=
"Loading"
border
border
fit
fit
@
sort-change=
"sortChange"
@
sort-change=
"sortChange"
highlight-current-row
highlight-current-row
v-if=
"tableDataTotal > 0"
v-if=
"tableDataTotal > 0
&& !isSkeleton
"
:default-sort =
"
{prop: 'skyCount', order: 'descending'}"
:default-sort =
"
{prop: 'skyCount', order: 'descending'}"
>
>
<el-table-column
label=
"序号"
width=
"60"
align=
"left"
fixed
>
<el-table-column
label=
"序号"
width=
"60"
align=
"left"
fixed
>
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<div
class=
"empty"
v-if=
"tableDataTotal === 0"
>
<div
class=
"empty"
v-if=
"tableDataTotal === 0
&& !isSkeleton
"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
...
@@ -92,10 +92,10 @@
...
@@ -92,10 +92,10 @@
import
aptitudeCode
from
'@/assets/json/aptitudeCode'
import
aptitudeCode
from
'@/assets/json/aptitudeCode'
import
{
enterprise
,
location
,
getUipIdByCid
}
from
'@/api/macro/macro'
import
{
enterprise
,
location
,
getUipIdByCid
}
from
'@/api/macro/macro'
import
Region
from
'../component/region'
import
Region
from
'../component/region'
import
skeleton
from
'../component/skeleton'
export
default
{
export
default
{
name
:
'Enterprises'
,
name
:
'Enterprises'
,
components
:
{
Region
},
components
:
{
Region
,
skeleton
},
data
()
{
data
()
{
return
{
return
{
encodeStr
,
encodeStr
,
...
@@ -124,6 +124,7 @@ export default {
...
@@ -124,6 +124,7 @@ export default {
provinceId
:
''
,
provinceId
:
''
,
show_page
:
true
,
show_page
:
true
,
MaxPage
:
500
,
MaxPage
:
500
,
isSkeleton
:
true
}
}
},
},
created
()
{
created
()
{
...
@@ -166,6 +167,7 @@ export default {
...
@@ -166,6 +167,7 @@ export default {
this
.
aptitudeCodeList
=
aptitudeCode
this
.
aptitudeCodeList
=
aptitudeCode
},
},
async
querySubmit
(){
async
querySubmit
(){
this
.
isSkeleton
=
true
;
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
}
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
}
if
(
this
.
queryParams
.
field
){
if
(
this
.
queryParams
.
field
){
params
.
field
=
this
.
queryParams
.
field
params
.
field
=
this
.
queryParams
.
field
...
@@ -192,6 +194,7 @@ export default {
...
@@ -192,6 +194,7 @@ export default {
params
.
aptitudeQueryDto
.
aptitudeDtoList
=
aptitudeType
params
.
aptitudeQueryDto
.
aptitudeDtoList
=
aptitudeType
}
}
enterprise
(
params
).
then
(
res
=>
{
enterprise
(
params
).
then
(
res
=>
{
this
.
isSkeleton
=
false
if
(
res
.
code
===
200
){
if
(
res
.
code
===
200
){
this
.
tableData
=
res
.
data
.
list
;
this
.
tableData
=
res
.
data
.
list
;
this
.
tableDataTotal
=
res
.
data
.
total
;
this
.
tableDataTotal
=
res
.
data
.
total
;
...
...
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @
23581658
...
@@ -28,16 +28,16 @@
...
@@ -28,16 +28,16 @@
<span
class=
"flex-box"
@
click=
"handleMessage"
><img
src=
"@/assets/images/ability_excel.png"
>
导出EXCEL
</span>
<span
class=
"flex-box"
@
click=
"handleMessage"
><img
src=
"@/assets/images/ability_excel.png"
>
导出EXCEL
</span>
</div>
</div>
</div>
</div>
<skeleton
v-if=
"isSkeleton"
style=
"padding: 16px"
></skeleton>
<div
class=
"table-item"
>
<div
class=
"table-item"
>
<el-table
<el-table
v-loading=
"tableLoading"
class=
"fixed-table"
class=
"fixed-table"
:data=
"tableData"
:data=
"tableData"
element-loading-text=
"Loading"
element-loading-text=
"Loading"
@
sort-change=
"sortChange"
@
sort-change=
"sortChange"
border
border
highlight-current-row
highlight-current-row
v-if=
"tableDataTotal > 0"
v-if=
"tableDataTotal > 0
&& !isSkeleton
"
:default-sort =
"
{prop: 'gdp', order: 'descending'}"
:default-sort =
"
{prop: 'gdp', order: 'descending'}"
>
>
<el-table-column
label=
"序号"
width=
"60"
align=
"left"
fixed
>
<el-table-column
label=
"序号"
width=
"60"
align=
"left"
fixed
>
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
<el-table-column
label=
"社会消费品零售总额(亿元)"
prop=
"trscg"
:formatter=
"formatStatus"
width=
"160"
align=
"right"
></el-table-column>
<el-table-column
label=
"社会消费品零售总额(亿元)"
prop=
"trscg"
:formatter=
"formatStatus"
width=
"160"
align=
"right"
></el-table-column>
<el-table-column
label=
"城镇居民人均可支配收入(元)"
prop=
"urbanPcdi"
:formatter=
"formatStatus"
width=
"160"
align=
"right"
></el-table-column>
<el-table-column
label=
"城镇居民人均可支配收入(元)"
prop=
"urbanPcdi"
:formatter=
"formatStatus"
width=
"160"
align=
"right"
></el-table-column>
</el-table>
</el-table>
<div
class=
"empty"
v-if=
"tableDataTotal === 0"
>
<div
class=
"empty"
v-if=
"tableDataTotal === 0
&& !isSkeleton
"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
...
@@ -117,11 +117,12 @@
...
@@ -117,11 +117,12 @@
import
{
nationalPage
,
getYears
}
from
'@/api/macro/macro'
import
{
nationalPage
,
getYears
}
from
'@/api/macro/macro'
import
dataRegion
from
'@/assets/json/dataRegion'
import
dataRegion
from
'@/assets/json/dataRegion'
import
economiesDetail
from
'./economies-detail'
import
economiesDetail
from
'./economies-detail'
import
skeleton
from
'../../component/skeleton'
import
axios
from
'axios'
import
axios
from
'axios'
export
default
{
export
default
{
name
:
'NationalEconomies'
,
name
:
'NationalEconomies'
,
components
:
{
components
:
{
economiesDetail
economiesDetail
,
skeleton
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -142,7 +143,8 @@
...
@@ -142,7 +143,8 @@
pageSize
:
20
,
pageSize
:
20
,
tableDataTotal
:
null
,
tableDataTotal
:
null
,
show_page
:
true
,
show_page
:
true
,
MaxPage
:
500
MaxPage
:
500
,
isSkeleton
:
true
}
}
},
},
created
()
{
created
()
{
...
@@ -227,7 +229,7 @@
...
@@ -227,7 +229,7 @@
},
},
// 查询提交
// 查询提交
async
querySubmit
()
{
async
querySubmit
()
{
this
.
tableLoading
=
true
this
.
isSkeleton
=
true
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
,
year
:
this
.
queryParams
.
year
,
type
:
1
}
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
,
year
:
this
.
queryParams
.
year
,
type
:
1
}
if
(
this
.
queryParams
.
address
){
if
(
this
.
queryParams
.
address
){
let
arr
=
this
.
$refs
.
address
.
getCheckedNodes
();
let
arr
=
this
.
$refs
.
address
.
getCheckedNodes
();
...
@@ -272,7 +274,7 @@
...
@@ -272,7 +274,7 @@
}
}
nationalPage
(
params
).
then
(
res
=>
{
nationalPage
(
params
).
then
(
res
=>
{
this
.
tableLoading
=
false
this
.
isSkeleton
=
false
this
.
tableData
=
res
.
data
.
list
;
this
.
tableData
=
res
.
data
.
list
;
this
.
tableDataTotal
=
res
.
data
.
totalCount
this
.
tableDataTotal
=
res
.
data
.
totalCount
})
})
...
...
dsk-operate-ui/src/views/macro/urban/index.vue
View file @
23581658
...
@@ -144,8 +144,9 @@
...
@@ -144,8 +144,9 @@
<span
class=
"flex-box"
@
click=
"handleMessage"
><img
src=
"@/assets/images/ability_excel.png"
>
导出EXCEL
</span>
<span
class=
"flex-box"
@
click=
"handleMessage"
><img
src=
"@/assets/images/ability_excel.png"
>
导出EXCEL
</span>
</div>
</div>
</div>
</div>
<skeleton
v-if=
"isSkeleton"
style=
"padding: 16px"
></skeleton>
<div
class=
"table-item"
>
<div
class=
"table-item"
>
<div
v-if=
"tableDataTotal > 0"
>
<div
v-if=
"tableDataTotal > 0
&& !isSkeleton
"
>
<el-table
<el-table
v-loading=
"tableLoading"
v-loading=
"tableLoading"
:data=
"tableData"
:data=
"tableData"
...
@@ -234,7 +235,7 @@
...
@@ -234,7 +235,7 @@
<!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
<!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
</el-table>
</el-table>
</div>
</div>
<div
class=
"empty"
v-if=
"tableDataTotal === 0"
>
<div
class=
"empty"
v-if=
"tableDataTotal === 0
&& !isSkeleton
"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<img
class=
"img"
src=
"@/assets/images/project/empty.png"
>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p1"
>
抱歉,没找到相关数据
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
<div
class=
"p2"
>
建议调整关键词或筛选条件,重新搜索
</div>
...
@@ -282,6 +283,7 @@
...
@@ -282,6 +283,7 @@
<
script
>
<
script
>
import
{
encodeStr
}
from
"@/assets/js/common.js"
import
{
encodeStr
}
from
"@/assets/js/common.js"
import
skeleton
from
'../component/skeleton'
import
dataRegion
from
'@/assets/json/dataRegion'
import
dataRegion
from
'@/assets/json/dataRegion'
import
api
from
'@/api/enterpriseData/enterpriseData.js'
;
import
api
from
'@/api/enterpriseData/enterpriseData.js'
;
import
elementResizeDetectorMaker
from
"element-resize-detector"
import
elementResizeDetectorMaker
from
"element-resize-detector"
...
@@ -291,7 +293,7 @@
...
@@ -291,7 +293,7 @@
export
default
{
export
default
{
name
:
'Urban'
,
name
:
'Urban'
,
components
:
{
components
:
{
Region
Region
,
skeleton
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -336,7 +338,7 @@ export default {
...
@@ -336,7 +338,7 @@ export default {
dataQuery
:{},
dataQuery
:{},
province
:
''
,
province
:
''
,
provinceId
:[],
provinceId
:[],
fixed
:
false
,
isSkeleton
:
true
}
}
},
},
watch
:{
watch
:{
...
@@ -452,7 +454,8 @@ export default {
...
@@ -452,7 +454,8 @@ export default {
},
},
// 查询提交
// 查询提交
async
querySubmit
()
{
async
querySubmit
()
{
this
.
tableLoading
=
true
// this.tableLoading = true;
this
.
isSkeleton
=
true
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
,
type
:
Number
(
this
.
queryParams
.
radio
)}
const
params
=
{
pageNum
:
this
.
pageIndex
,
pageSize
:
this
.
pageSize
,
type
:
Number
(
this
.
queryParams
.
radio
)}
const
param
=
{}
const
param
=
{}
// if(this.queryParams.address.length > 0){
// if(this.queryParams.address.length > 0){
...
@@ -529,7 +532,7 @@ export default {
...
@@ -529,7 +532,7 @@ export default {
}
}
urbanInvestmentPage
(
params
).
then
(
res
=>
{
urbanInvestmentPage
(
params
).
then
(
res
=>
{
this
.
tableLoading
=
false
this
.
isSkeleton
=
false
this
.
tableData
=
res
.
data
.
list
;
this
.
tableData
=
res
.
data
.
list
;
this
.
tableDataTotal
=
res
.
data
.
totalCount
this
.
tableDataTotal
=
res
.
data
.
totalCount
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment