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
be603d50
Commit
be603d50
authored
Sep 13, 2023
by
danfuman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
5a19e780
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
12 deletions
+28
-12
groupAccount.js
dsk-operate-ui/src/api/detail/groupAccount/groupAccount.js
+8
-0
index.vue
dsk-operate-ui/src/views/detail/groupAccount/index.vue
+10
-2
index.vue
...te-ui/src/views/enterpriseData/components/Group/index.vue
+6
-6
localEconomy.vue
...e-ui/src/views/macro/economies/component/localEconomy.vue
+1
-1
index.vue
dsk-operate-ui/src/views/macro/enterprises/index.vue
+1
-1
qgjjdq.vue
...ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
+1
-1
index.vue
dsk-operate-ui/src/views/macro/urban/index.vue
+1
-1
No files found.
dsk-operate-ui/src/api/detail/groupAccount/groupAccount.js
View file @
be603d50
import
request
from
"@/utils/request"
;
import
request
from
"@/utils/request"
;
// 集团logo
export
function
combineMemberLogo
(
data
)
{
return
request
({
url
:
'/combine/info/combineMemberLogo'
,
method
:
'post'
,
data
:
data
})
}
// 集团成员列表
// 集团成员列表
export
function
memberList
(
data
)
{
export
function
memberList
(
data
)
{
return
request
({
return
request
({
...
...
dsk-operate-ui/src/views/detail/groupAccount/index.vue
View file @
be603d50
<
template
>
<
template
>
<div
class=
"app-container group-container"
>
<div
class=
"app-container group-container"
>
<div
class=
"header-container"
>
<div
class=
"header-container"
ref=
"header"
>
<div
class=
"flex-box part-header"
>
<div
class=
"flex-box part-header"
>
<img
class=
"header-logo"
:src=
"require('@/assets/images/detail/company_logo.png')"
>
<img
class=
"header-logo"
:src=
"require('@/assets/images/detail/company_logo.png')"
>
{{
name
||
'--'
}}
{{
name
||
'--'
}}
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
import
Performance
from
"./component/performance"
import
Performance
from
"./component/performance"
import
Zhaobiao
from
"./component/zhaobiao"
import
Zhaobiao
from
"./component/zhaobiao"
import
{
infoHeader
}
from
'@/api/detail/party-a/index'
import
{
infoHeader
}
from
'@/api/detail/party-a/index'
import
{
combineMemberLogo
}
from
'@/api/detail/groupAccount/groupAccount'
import
elementResizeDetectorMaker
from
"element-resize-detector"
import
elementResizeDetectorMaker
from
"element-resize-detector"
export
default
{
export
default
{
name
:
'GroupAccount'
,
name
:
'GroupAccount'
,
...
@@ -46,13 +47,16 @@
...
@@ -46,13 +47,16 @@
},
},
isCompany
:
false
,
isCompany
:
false
,
isSkeleton
:
false
,
isSkeleton
:
false
,
name
:
''
name
:
''
,
}
}
},
},
created
()
{
created
()
{
if
(
this
.
$route
.
params
.
id
)
{
// customerId
if
(
this
.
$route
.
params
.
id
)
{
// customerId
this
.
customerId
=
this
.
$route
.
params
.
id
this
.
customerId
=
this
.
$route
.
params
.
id
}
}
combineMemberLogo
({
combineId
:
this
.
customerId
}).
then
(
res
=>
{
console
.
log
(
res
.
data
)
})
// if (this.$route.query.path) { // 获取跳转对应板块
// if (this.$route.query.path) { // 获取跳转对应板块
// this.currentPath.pathName = this.$route.query.path
// this.currentPath.pathName = this.$route.query.path
// }
// }
...
@@ -60,6 +64,8 @@
...
@@ -60,6 +64,8 @@
this
.
name
=
this
.
$route
.
query
.
name
?
this
.
$route
.
query
.
name
:
'中建集团'
this
.
name
=
this
.
$route
.
query
.
name
?
this
.
$route
.
query
.
name
:
'中建集团'
},
},
mounted
(){
mounted
(){
// this.mainWidth=this.$refs.header.offsetWidth;
// this.width=this.$refs.contentData.offsetWidth -160;
},
},
methods
:
{
methods
:
{
showPartPage
(
e
){
showPartPage
(
e
){
...
@@ -81,6 +87,7 @@
...
@@ -81,6 +87,7 @@
.group-main
{
.group-main
{
margin-top
:
12px
;
margin-top
:
12px
;
position
:
fixed
;
position
:
fixed
;
/*width: 100%;*/
width
:
calc
(
100%
-
192px
);
width
:
calc
(
100%
-
192px
);
height
:
calc
(
100vh
-
155px
);
height
:
calc
(
100vh
-
155px
);
overflow-y
:
auto
;
overflow-y
:
auto
;
...
@@ -91,6 +98,7 @@
...
@@ -91,6 +98,7 @@
padding-bottom
:
16px
;
padding-bottom
:
16px
;
position
:
fixed
;
position
:
fixed
;
background
:
#FFFFFF
;
background
:
#FFFFFF
;
width
:
144px
;
}
}
.group-right
{
.group-right
{
min-width
:
1088px
;
min-width
:
1088px
;
...
...
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @
be603d50
<
template
>
<
template
>
<!--
<div
style=
"width:calc(100% - 100px);"
@
click=
"showlist = false"
>
-->
<!--
<div
style=
"width:calc(100% - 100px);"
@
click=
"showlist = false"
>
-->
<div
class=
"app-container enterprise_contatiner"
@
click=
"showlist = false"
>
<div
class=
"app-container enterprise_contatiner"
@
click=
"showlist = false"
>
<div
class=
"title_wrap"
>
<div
class=
"title_wrap"
>
<div
class=
"enterprise_title"
>
<div
class=
"enterprise_title"
>
...
@@ -347,7 +347,7 @@ export default {
...
@@ -347,7 +347,7 @@ export default {
search
(
page
=
1
){
search
(
page
=
1
){
this
.
page
=
page
;
this
.
page
=
page
;
if
(
!
this
.
companyName
.
trim
()){
if
(
!
this
.
companyName
.
trim
()){
return
return
}
}
let
data
=
{
let
data
=
{
keyword
:
this
.
companyName
,
keyword
:
this
.
companyName
,
...
@@ -377,13 +377,13 @@ export default {
...
@@ -377,13 +377,13 @@ export default {
return
this
.
$message
.
warning
(
"抱歉,没找到相关数据,建议调整关键词或筛选条件,重新搜索"
)
return
this
.
$message
.
warning
(
"抱歉,没找到相关数据,建议调整关键词或筛选条件,重新搜索"
)
}
}
let
item
=
this
.
searchList
[
0
]
let
item
=
this
.
searchList
[
0
]
this
.
$router
.
push
({
path
:
`/groupAccount/
${
item
.
combineId
}
?name=
${
item
.
combineName
.
replace
(
new
RegExp
(
"<font color='#FF204E'>"
,
'g'
),
''
).
replace
(
new
RegExp
(
"</font>"
,
'g'
),
''
)}
`
})
this
.
$router
.
push
({
path
:
`/groupAccount/
${
item
.
combineId
}
?name=
${
item
.
combineName
.
replace
(
new
RegExp
(
"<font color='#FF204E'>"
,
'g'
),
''
).
replace
(
new
RegExp
(
"</font>"
,
'g'
),
''
)}
&cid=
${
item
.
combineMemberCid
}
`
})
},
},
selCompany
(
item
=
this
.
searchList
[
0
]){
selCompany
(
item
=
this
.
searchList
[
0
]){
if
(
!
item
){
if
(
!
item
){
return
this
.
$message
.
warning
(
"抱歉,没找到相关数据,建议调整关键词或筛选条件,重新搜索"
)
return
this
.
$message
.
warning
(
"抱歉,没找到相关数据,建议调整关键词或筛选条件,重新搜索"
)
}
}
this
.
$router
.
push
({
path
:
`/groupAccount/
${
item
.
combineId
}
?name=
${
item
.
combineName
.
replace
(
new
RegExp
(
"<font color='#FF204E'>"
,
'g'
),
''
).
replace
(
new
RegExp
(
"</font>"
,
'g'
),
''
)}
`
})
this
.
$router
.
push
({
path
:
`/groupAccount/
${
item
.
combineId
}
?name=
${
item
.
combineName
.
replace
(
new
RegExp
(
"<font color='#FF204E'>"
,
'g'
),
''
).
replace
(
new
RegExp
(
"</font>"
,
'g'
),
''
)}
&cid=
${
item
.
combineMemberCid
}
`
})
},
},
}
}
}
}
...
@@ -658,5 +658,5 @@ export default {
...
@@ -658,5 +658,5 @@ export default {
}
}
}
}
}
}
}
}
</
style
>
</
style
>
\ No newline at end of file
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @
be603d50
...
@@ -76,7 +76,7 @@ export default {
...
@@ -76,7 +76,7 @@ export default {
tableData
:[],
tableData
:[],
tableLoading
:
false
,
tableLoading
:
false
,
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
2
0
,
pageSize
:
5
0
,
tableDataTotal
:
0
,
tableDataTotal
:
0
,
show_page
:
true
,
show_page
:
true
,
MaxPage
:
500
,
MaxPage
:
500
,
...
...
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @
be603d50
...
@@ -118,7 +118,7 @@ export default {
...
@@ -118,7 +118,7 @@ export default {
tableData
:
[],
tableData
:
[],
tableLoading
:
false
,
tableLoading
:
false
,
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
2
0
,
pageSize
:
5
0
,
tableDataTotal
:
null
,
tableDataTotal
:
null
,
aptitudeCodeList
:[],
aptitudeCodeList
:[],
aptitudeType
:
''
,
aptitudeType
:
''
,
...
...
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @
be603d50
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
tableData
:
[],
tableData
:
[],
tableLoading
:
false
,
tableLoading
:
false
,
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
2
0
,
pageSize
:
5
0
,
tableDataTotal
:
null
,
tableDataTotal
:
null
,
show_page
:
true
,
show_page
:
true
,
MaxPage
:
500
,
MaxPage
:
500
,
...
...
dsk-operate-ui/src/views/macro/urban/index.vue
View file @
be603d50
...
@@ -314,7 +314,7 @@ export default {
...
@@ -314,7 +314,7 @@ export default {
tableData
:[],
tableData
:[],
tableLoading
:
false
,
tableLoading
:
false
,
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
2
0
,
pageSize
:
5
0
,
tableDataTotal
:
null
,
tableDataTotal
:
null
,
selected
:[],
selected
:[],
xzdjCalss
:
''
,
xzdjCalss
:
''
,
...
...
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