Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
28c08a2f
Commit
28c08a2f
authored
Aug 31, 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
fb16a235
a7def187
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
performance.vue
...i/src/views/detail/groupAccount/component/performance.vue
+1
-1
zhaobiao.vue
...e-ui/src/views/detail/groupAccount/component/zhaobiao.vue
+1
-1
No files found.
dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue
View file @
28c08a2f
...
@@ -164,7 +164,7 @@
...
@@ -164,7 +164,7 @@
}
}
delete
data
.
cgbl
delete
data
.
cgbl
}
}
this
.
dataEXCEL
=
data
;
this
.
dataEXCEL
=
JSON
.
parse
(
JSON
.
stringify
(
data
))
;
businessList
(
data
).
then
(
res
=>
{
businessList
(
data
).
then
(
res
=>
{
this
.
tableData
=
res
.
code
==
200
?
res
.
rows
:[]
this
.
tableData
=
res
.
code
==
200
?
res
.
rows
:[]
this
.
tableDataTotal
=
res
.
total
this
.
tableDataTotal
=
res
.
total
...
...
dsk-operate-ui/src/views/detail/groupAccount/component/zhaobiao.vue
View file @
28c08a2f
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
if
(
!
data
.
endTime
){
if
(
!
data
.
endTime
){
data
.
endTime
=
this
.
formatDate
(
new
Date
())
data
.
endTime
=
this
.
formatDate
(
new
Date
())
}
}
this
.
dataEXCEL
=
data
;
this
.
dataEXCEL
=
JSON
.
parse
(
JSON
.
stringify
(
data
))
;
bidPage
(
data
).
then
(
res
=>
{
bidPage
(
data
).
then
(
res
=>
{
this
.
tableData
=
res
.
code
==
200
?
res
.
rows
:[];
this
.
tableData
=
res
.
code
==
200
?
res
.
rows
:[];
console
.
log
(
res
.
total
)
console
.
log
(
res
.
total
)
...
...
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