Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
R
revised-version-h5
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
孟庆瑞
revised-version-h5
Commits
10c4eb8c
Commit
10c4eb8c
authored
Sep 12, 2024
by
mengqr
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development_mqr'
parents
2354540c
32a0fa93
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
667 additions
and
161 deletions
+667
-161
test.js
src/api/test.js
+20
-0
index.js
src/router/router_modular/index.js
+1
-1
abnormalReview.vue
src/views/actualCombat/abnormalReview.vue
+37
-1
detail.vue
src/views/actualCombat/detail.vue
+474
-143
index.vue
src/views/actualCombat/index.vue
+14
-5
record.vue
src/views/actualCombat/record.vue
+118
-11
vue.config.js
vue.config.js
+3
-0
No files found.
src/api/test.js
View file @
10c4eb8c
...
@@ -55,6 +55,26 @@ const testApi = {
...
@@ -55,6 +55,26 @@ const testApi = {
queryFollowAccountReviews
(
data
){
queryFollowAccountReviews
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/queryFollowAccountReviews'
,
data
)
return
http
.
post
(
'/invest/admin/pc/followaccount/queryFollowAccountReviews'
,
data
)
},
},
//调仓记录
followAccountZfzt
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/queryFollowAccountDeals'
,
data
)
},
//跟投详情
followaccountDetail
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/getFollowAccount'
,
data
)
},
//持仓配置
queryFollowAccountPositions
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/queryFollowAccountPositions'
,
data
)
},
//行业占比信息
getFollowAccountIndustryPercent
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/getFollowAccountIndustryPercent'
,
data
)
},
//曲线图
getFollowAccountYieldsRecords
(
data
){
return
http
.
post
(
'/invest/admin/pc/followaccount/getFollowAccountYieldsRecords'
,
data
)
},
};
};
export
default
testApi
export
default
testApi
src/router/router_modular/index.js
View file @
10c4eb8c
...
@@ -56,7 +56,7 @@ const router_modular = [
...
@@ -56,7 +56,7 @@ const router_modular = [
component
:
()
=>
import
(
'@/views/actualCombat/abnormalReview'
)
component
:
()
=>
import
(
'@/views/actualCombat/abnormalReview'
)
},
},
{
{
path
:
'/
r
ecord'
,
path
:
'/
actualCombatR
ecord'
,
name
:
'record'
,
name
:
'record'
,
component
:
()
=>
import
(
'@/views/actualCombat/record'
)
component
:
()
=>
import
(
'@/views/actualCombat/record'
)
},
},
...
...
src/views/actualCombat/abnormalReview.vue
View file @
10c4eb8c
<
template
>
<
template
>
<div
class=
"content"
>
<div
class=
"content"
>
<div
class=
"ster"
>
<img
src=
"../../assets/left.png"
alt=
""
style=
"width: 0.5rem;
height: 0.8rem;
margin-top: 0.1rem;
margin-left: 0.2rem;"
@
click=
"tab_oimg"
/>
<div
class=
"deta"
>
异动点评
</div>
</div>
<div
class=
"listBox"
v-for=
"i in list"
:key=
"i.id"
>
<div
class=
"listBox"
v-for=
"i in list"
:key=
"i.id"
>
<div
class=
"left-box"
>
<div
class=
"left-box"
>
<div
class=
"left-time"
>
<div
class=
"left-time"
>
...
@@ -46,7 +58,7 @@ export default {
...
@@ -46,7 +58,7 @@ export default {
// ...mapMutations("store_modular", ["operation"]),
// ...mapMutations("store_modular", ["operation"]),
getList
()
{
getList
()
{
let
temp
=
{
let
temp
=
{
followAccountId
:
5
,
followAccountId
:
this
.
$route
.
query
.
id
,
page
:
1
,
page
:
1
,
pageSize
:
100
pageSize
:
100
}
}
...
@@ -107,6 +119,15 @@ let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSecond
...
@@ -107,6 +119,15 @@ let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSecond
let
GMT
=
Hour
+
':'
+
Minute
let
GMT
=
Hour
+
':'
+
Minute
return
GMT
return
GMT
},
},
tab_oimg
:
function
()
{
this
.
$router
.
push
({
path
:
'/detail'
,
query
:
{
id
:
this
.
$route
.
query
.
id
}
});
// this.$router.push("../detail");
},
},
},
};
};
...
@@ -166,4 +187,19 @@ return GMT
...
@@ -166,4 +187,19 @@ return GMT
color
:
blue
;
color
:
blue
;
font-size
:
0.3rem
;
font-size
:
0.3rem
;
}
}
.ster
{
display
:
flex
;
background-color
:
rgb
(
226
,
74
,
68
);
height
:
1rem
;
line-height
:
1rem
;
}
.deta
{
width
:
70%
;
text-align
:
center
;
margin-left
:
34px
;
font-size
:
0.5rem
;
color
:
white
;
/* background: #e03939; */
font-weight
:
bolder
;
}
</
style
>
</
style
>
\ No newline at end of file
src/views/actualCombat/detail.vue
View file @
10c4eb8c
This diff is collapsed.
Click to expand it.
src/views/actualCombat/index.vue
View file @
10c4eb8c
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
</div>
</div>
<!-- 卡片盒子 -->
<!-- 卡片盒子 -->
<div
class=
"card-box"
>
<div
class=
"card-box"
>
<div
class=
"left-card"
>
<div
class=
"left-card"
@
click=
"jumpDetail(profitIdTwo)"
>
<div
class=
"card-title"
>
<div
class=
"card-title"
>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitSecond
*
100
}}
%
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitSecond
*
100
}}
%
</span>
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<span
v-if=
"isBuyFirst==1"
class=
"clickBtnGray"
>
已兑换
</span>
<span
v-if=
"isBuyFirst==1"
class=
"clickBtnGray"
>
已兑换
</span>
</div>
</div>
<div
class=
"center-card"
>
<div
class=
"center-card"
@
click=
"jumpDetail(profitIdFirst)"
>
<div
class=
"card-title"
>
<div
class=
"card-title"
>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitFirst
*
100
}}
%
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitFirst
*
100
}}
%
</span>
...
@@ -41,8 +41,8 @@
...
@@ -41,8 +41,8 @@
</span>
</span>
<span
v-if=
"isBuyTwo==2"
class=
"clickBtn"
@
click=
"showPopup(profitIdFirst)"
>
兑换解锁
</span>
<span
v-if=
"isBuyTwo==2"
class=
"clickBtn"
@
click=
"showPopup(profitIdFirst)"
>
兑换解锁
</span>
<span
v-if=
"isBuyTwo==1"
class=
"clickBtnGray"
>
已兑换
</span>
<span
v-if=
"isBuyTwo==1"
class=
"clickBtnGray"
>
已兑换
</span>
</div>
</div>
<div
class=
"rigth-card"
>
<div
class=
"rigth-card"
@
click=
"jumpDetail(profitThree)"
>
<div
class=
"card-title"
>
<div
class=
"card-title"
>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;margin-bottom:0.1rem"
>
{{
tableName
}}
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitThree
*
100
}}
%
</span>
<span
style=
"display:block;font-size:0.5rem;"
>
{{
profitThree
*
100
}}
%
</span>
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
</div>
</div>
<!-- 内容盒子 -->
<!-- 内容盒子 -->
<div
style=
"padding-bottom:0.5rem"
>
<div
style=
"padding-bottom:0.5rem"
>
<div
class=
"bottomcontect-box"
v-for=
"(i,index) in profitList"
:key=
"i.id"
style=
"margin-bottom:0.5rem"
>
<div
class=
"bottomcontect-box"
v-for=
"(i,index) in profitList"
:key=
"i.id"
@
click=
"jumpDetail(i.id)"
style=
"margin-bottom:0.5rem"
>
<div
class=
"topthis-box"
>
<div
class=
"topthis-box"
>
<div
class=
"top-left"
>
<div
class=
"top-left"
>
<span
style=
"display:block;font-size:0.5rem"
>
{{
i
.
productName
}}
</span>
<span
style=
"display:block;font-size:0.5rem"
>
{{
i
.
productName
}}
</span>
...
@@ -236,6 +236,15 @@ this.clickTab('yields','总收益')
...
@@ -236,6 +236,15 @@ this.clickTab('yields','总收益')
this
.
checkList
=
res
.
data
.
data
this
.
checkList
=
res
.
data
.
data
})
})
},
},
//跳转到详情页
jumpDetail
(
id
){
this
.
$router
.
push
({
path
:
'/detail'
,
query
:
{
id
:
id
}
});
},
//点击标签页
//点击标签页
clickTab
(
index
,
name
){
clickTab
(
index
,
name
){
console
.
log
()
console
.
log
()
...
...
src/views/actualCombat/record.vue
View file @
10c4eb8c
<
template
>
<
template
>
<div
class=
"content"
>
<div
class=
"content"
>
<div
class=
"ster"
>
<img
src=
"../../assets/left.png"
alt=
""
style=
"width: 0.5rem;
height: 0.8rem;
margin-top: 0.1rem;
margin-left: 0.2rem;"
@
click=
"tab_oimg"
/>
<div
class=
"deta"
>
调仓记录
</div>
</div>
<div
class=
"head-box"
>
<div
class=
"head-box"
>
<div
class=
"tab-box"
>
<div
class=
"tab-box"
>
<span>
买/卖
</span>
<span>
买/卖
</span>
...
@@ -22,28 +34,34 @@
...
@@ -22,28 +34,34 @@
<div
class=
"line"
>
<div
class=
"line"
>
</div>
</div>
<div
class=
"contect-list"
>
<div
v-for=
"i in list"
:key=
"i.code"
>
<div
class=
"mai"
>
<div
class=
"contect-list"
>
<div
v-if=
"i.direction==1"
class=
"maiTwo"
>
<span
>
买
</span>
</div>
<div
v-if=
"i.direction==2"
class=
"mai"
>
<span
>
卖
</span>
<span
>
卖
</span>
</div>
</div>
<div
class=
"contectBox"
>
<div
class=
"contectBox"
>
<span>
300***
</span>
<span>
{{
i
.
count
}}
</span>
</div>
</div>
<div
class=
"contectBox"
>
<div
class=
"contectBox"
>
<span>
*
</span>
<span>
{{
i
.
price
}}
</span>
</div>
</div>
<div
class=
"contectBox"
>
<div
class=
"contectBox"
>
<span>
100
%
</span>
<span>
{{
i
.
remark
.
toFixed
(
2
)
}}
%
</span>
</div>
</div>
<div
class=
"contectBox"
>
<div
class=
"contectBox"
>
<span
style=
"display:block;height:0.5rem;margin-top:-0.3rem"
>
08/26
</span>
<span
style=
"display:block;height:0.5rem;margin-top:-0.3rem"
>
{{
state_type
(
i
.
created_TIME
)
}}
</span>
<span>
14:28
</span>
<span>
{{
state_typeTwo
(
i
.
created_TIME
)
}}
</span>
</div>
</div>
</div>
</div>
<!-- 灰线 -->
<!-- 灰线 -->
<div
class=
"lineTwo"
>
<div
class=
"lineTwo"
>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -61,9 +79,72 @@ export default {
...
@@ -61,9 +79,72 @@ export default {
list
:
[],
list
:
[],
};
};
},
},
mounted
(){
this
.
getList
()
},
methods
:
{
methods
:
{
// ...mapMutations("store_modular", ["operation"]),
// ...mapMutations("store_modular", ["operation"]),
getList
()
{
let
temp
=
{
followAccountId
:
this
.
$route
.
query
.
id
,
page
:
1
,
pageSize
:
100
}
this
.
server
.
followAccountZfzt
(
temp
).
then
((
res
)
=>
{
this
.
list
=
res
.
data
.
data
.
list
this
.
list
.
forEach
((
i
,
index
)
=>
{
i
.
remark
=
parseFloat
(
i
.
remark
)
*
100
})
})
// this.$toast.loading({
// message: '加载中...',
// forbidClick: true,
// duration:0
// });
},
tab_oimg
:
function
()
{
this
.
$router
.
push
({
path
:
'/detail'
,
query
:
{
id
:
this
.
$route
.
query
.
id
}
});
// this.$router.push("../detail");
},
state_type
(
row
)
{
console
.
log
(
"睡觉哦"
,
row
)
// if(cellValue==null){
// return cellValue
// }
let
date
=
new
Date
(
parseInt
(
row
));
let
Year
=
date
.
getFullYear
();
let
Moth
=
(
date
.
getMonth
()
+
1
<
10
?
'0'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
);
let
Day
=
(
date
.
getDate
()
<
10
?
'0'
+
date
.
getDate
()
:
date
.
getDate
());
let
Hour
=
(
date
.
getHours
()
<
10
?
'0'
+
date
.
getHours
()
:
date
.
getHours
());
let
Minute
=
(
date
.
getMinutes
()
<
10
?
'0'
+
date
.
getMinutes
()
:
date
.
getMinutes
());
let
Sechond
=
(
date
.
getSeconds
()
<
10
?
'0'
+
date
.
getSeconds
()
:
date
.
getSeconds
());
let
GMT
=
Moth
+
'/'
+
Day
return
GMT
},
state_typeTwo
(
row
)
{
console
.
log
(
"睡觉哦"
,
row
)
// if(cellValue==null){
// return cellValue
// }
let
date
=
new
Date
(
parseInt
(
row
));
let
Year
=
date
.
getFullYear
();
let
Moth
=
(
date
.
getMonth
()
+
1
<
10
?
'0'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
);
let
Day
=
(
date
.
getDate
()
<
10
?
'0'
+
date
.
getDate
()
:
date
.
getDate
());
let
Hour
=
(
date
.
getHours
()
<
10
?
'0'
+
date
.
getHours
()
:
date
.
getHours
());
let
Minute
=
(
date
.
getMinutes
()
<
10
?
'0'
+
date
.
getMinutes
()
:
date
.
getMinutes
());
let
Sechond
=
(
date
.
getSeconds
()
<
10
?
'0'
+
date
.
getSeconds
()
:
date
.
getSeconds
());
let
GMT
=
Hour
+
':'
+
Minute
return
GMT
},
},
},
...
@@ -75,7 +156,7 @@ export default {
...
@@ -75,7 +156,7 @@ export default {
height
:
1.2rem
;
height
:
1.2rem
;
width
:
100%
;
width
:
100%
;
display
:
flex
;
display
:
flex
;
background-color
:
yellow
;
/* background-color: yellow; */
}
}
.tab-box
{
.tab-box
{
width
:
20%
;
width
:
20%
;
...
@@ -83,7 +164,7 @@ height: 100%;
...
@@ -83,7 +164,7 @@ height: 100%;
text-align
:
center
;
text-align
:
center
;
line-height
:
1.2rem
;
line-height
:
1.2rem
;
font-size
:
0.35rem
;
font-size
:
0.35rem
;
background-color
:
aquamarine
;
/* background-color: aquamarine; */
}
}
.line
{
.line
{
width
:
100%
;
width
:
100%
;
...
@@ -99,7 +180,7 @@ background-color: aquamarine;
...
@@ -99,7 +180,7 @@ background-color: aquamarine;
display
:
flex
;
display
:
flex
;
height
:
1.5rem
;
height
:
1.5rem
;
width
:
100%
;
width
:
100%
;
background-color
:
yellowgreen
;
/* background-color: yellowgreen; */
font-size
:
0.5rem
;
font-size
:
0.5rem
;
}
}
.contectBox
{
.contectBox
{
...
@@ -120,4 +201,30 @@ line-height: 1.5rem;
...
@@ -120,4 +201,30 @@ line-height: 1.5rem;
border-radius
:
50%
;
border-radius
:
50%
;
}
}
.maiTwo
{
display
:
block
;
height
:
1rem
;
width
:
1rem
;
border
:
1px
solid
rgb
(
214
,
85
,
72
);
color
:
rgb
(
214
,
85
,
72
);
text-align
:
center
;
line-height
:
1rem
;
margin
:
auto
;
border-radius
:
50%
;
}
.ster
{
display
:
flex
;
background-color
:
rgb
(
226
,
74
,
68
);
height
:
1rem
;
line-height
:
1rem
;
}
.deta
{
width
:
70%
;
text-align
:
center
;
margin-left
:
34px
;
font-size
:
0.5rem
;
color
:
white
;
/* background: #e03939; */
font-weight
:
bolder
;
}
</
style
>
</
style
>
\ No newline at end of file
vue.config.js
View file @
10c4eb8c
...
@@ -10,6 +10,9 @@ module.exports = defineConfig({
...
@@ -10,6 +10,9 @@ module.exports = defineConfig({
port
:
8080
,
port
:
8080
,
hot
:
true
,
hot
:
true
,
https
:
false
,
https
:
false
,
client
:
{
overlay
:
false
,
},
proxy
:
{
//配置多个代理
proxy
:
{
//配置多个代理
"/testIp"
:
{
"/testIp"
:
{
target
:
"http://197.0.0.1:8088"
,
target
:
"http://197.0.0.1:8088"
,
...
...
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