Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
civil-front
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
civil
civil-front
Commits
ac6c9856
Commit
ac6c9856
authored
Jul 01, 2021
by
苏咏卓
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://139.159.239.83:9093/civil/civil-front
parents
47f6923e
eb5a28dc
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
12 deletions
+13
-12
src/layout/components/Sidebar/Logo.vue
+2
-2
src/settings.js
+1
-1
src/views/unified/tapSwitch/provide.vue
+4
-4
src/views/unified/tapSwitch/socialOrganization.vue
+5
-4
src/views/unified/tapSwitch/subsidies.vue
+1
-1
No files found.
src/layout/components/Sidebar/Logo.vue
View file @
ac6c9856
...
...
@@ -14,7 +14,7 @@
</
template
>
<
script
>
import
Logo
from
'@/assets/images/logo.png'
//
import Logo from '@/assets/images/logo.png'
export
default
{
name
:
'SidebarLogo'
,
props
:
{
...
...
@@ -26,7 +26,7 @@ export default {
data
()
{
return
{
title
:
'民政数据分析系统'
,
logo
:
Logo
//
logo: Logo
}
}
}
...
...
src/settings.js
View file @
ac6c9856
...
...
@@ -6,7 +6,7 @@ module.exports = {
/**
* @description 是否显示 tagsView
*/
tagsView
:
tru
e
,
tagsView
:
fals
e
,
/**
* @description 固定头部
*/
...
...
src/views/unified/tapSwitch/provide.vue
View file @
ac6c9856
...
...
@@ -273,7 +273,7 @@ export default {
tableData
:
[],
value
:
""
,
cremationStats
:
{},
cremationRateStats
:
{}
,
cremationRateStats
:
[]
,
cremationStatsList
:
{},
cremation
:
[],
pageInfo
:
{
...
...
@@ -326,7 +326,7 @@ export default {
getCremationStatsFun
(
data
)
{
getCremationStats
({
areaCode
:
data
}).
then
((
res
)
=>
{
console
.
log
(
res
,
"统计该区域的殡葬火化量"
);
if
(
JSON
.
stringify
(
res
.
data
)
==
'{}'
)
{
if
(
!
res
.
data
.
cremationSum
)
{
this
.
tionStats
=
true
return
}
...
...
@@ -338,7 +338,7 @@ export default {
getCremationRateStatsFun
(
data
)
{
getCremationRateStats
({
areaCode
:
data
}).
then
((
res
)
=>
{
console
.
log
(
res
,
"区域火化率"
);
if
(
JSON
.
stringify
(
res
.
data
)
==
'{}'
)
{
if
(
res
.
data
.
length
==
0
)
{
this
.
RateStats
=
true
return
}
...
...
@@ -354,7 +354,7 @@ export default {
getCremationStatsListFun
(
data
)
{
getCremationStatsList
({
areaCode
:
data
}).
then
((
res
)
=>
{
console
.
log
(
res
,
"获取区域殡葬火化分析列表"
);
if
(
JSON
.
stringify
(
res
.
data
)
==
'{}'
)
{
if
(
res
.
data
.
cityList
.
length
==
0
)
{
this
.
StatsList
=
true
return
}
...
...
src/views/unified/tapSwitch/socialOrganization.vue
View file @
ac6c9856
...
...
@@ -42,7 +42,7 @@
<div
class=
"textLeft"
>
社团
</div>
<div>
<div
class=
"borderBottom"
></div>
<div
class=
"textNum"
>
{{
soorganStats
.
leagueNum
}}
</div>
<div
class=
"textNum"
>
{{
soorganStats
.
leagueNum
?
soorganStats
.
leagueNum
:
0
}}
</div>
<div
class=
"borderTop"
></div>
</div>
<div
class=
"text"
>
个
</div>
...
...
@@ -51,7 +51,7 @@
<div
class=
"textLeft"
>
民非
</div>
<div>
<div
class=
"borderBottom"
></div>
<div
class=
"textNum"
>
{{
soorganStats
.
minFeiNum
}}
</div>
<div
class=
"textNum"
>
{{
soorganStats
.
minFeiNum
?
soorganStats
.
minFeiNum
:
0
}}
</div>
<div
class=
"borderTop"
></div>
</div>
<div
class=
"text"
>
个
</div>
...
...
@@ -60,7 +60,7 @@
<div
class=
"textLefts"
>
基金会
</div>
<div>
<div
class=
"borderBottom"
></div>
<div
class=
"textNum"
>
{{
soorganStats
.
foundationNum
}}
</div>
<div
class=
"textNum"
>
{{
soorganStats
.
foundationNum
?
soorganStats
.
foundationNum
:
0
}}
</div>
<div
class=
"borderTop"
></div>
</div>
<div
class=
"text"
>
个
</div>
...
...
@@ -357,6 +357,7 @@ export default {
this
.
ganStats
=
true
return
}
this
.
soorganStats
=
res
.
data
;
this
.
ganStats
=
false
});
...
...
@@ -365,7 +366,7 @@ export default {
getSoorganPercentageStatsFun
(
data
)
{
getSoorganPercentageStats
({
areaCode
:
data
}).
then
((
res
)
=>
{
console
.
log
(
res
.
data
,
"获取社会机构区域占比统计"
);
if
(
res
.
data
.
le
gend
==
0
)
{
if
(
res
.
data
.
le
ngth
==
0
)
{
this
.
PercentageStats
=
true
return
}
...
...
src/views/unified/tapSwitch/subsidies.vue
View file @
ac6c9856
...
...
@@ -325,7 +325,7 @@ export default {
getYearDisabledIssueStatsFun
(
data
)
{
getYearDisabledIssueStats
({
areaCode
:
data
}).
then
((
res
)
=>
{
console
.
log
(
res
,
"近三年发放人数和金额统计"
);
if
(
JSON
.
stringify
(
res
.
data
)
==
'{}'
)
{
if
(
res
.
data
.
admin
.
difficultAmountList
.
length
==
0
)
{
this
.
IssueStats
=
true
return
}
...
...
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