Skip to content

R
revised-version-h5
Commit 10c4eb8c authored by mengqr's avatar mengqr
Browse files
Options

Merge branch 'development_mqr'

parents 2354540c 32a0fa93
Show whitespace changes
Inline Side-by-side
Showing with 667 additions and 161 deletions
src/api/test.js
View file @ 10c4eb8c
......@@ -55,6 +55,26 @@ const testApi = {
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
src/router/router_modular/index.js
View file @ 10c4eb8c
......@@ -56,7 +56,7 @@ const router_modular = [
component: () => import('@/views/actualCombat/abnormalReview')
},
{
path: '/record',
path: '/actualCombatRecord',
name: 'record',
component: () => import('@/views/actualCombat/record')
},
......
src/views/actualCombat/abnormalReview.vue
View file @ 10c4eb8c
<template>
<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="left-box">
<div class="left-time">
......@@ -46,7 +58,7 @@ export default {
// ...mapMutations("store_modular", ["operation"]),
getList() {
let temp={
followAccountId:5,
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
......@@ -107,6 +119,15 @@ let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSecond
let GMT = Hour + ':' + Minute
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
color: blue;
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>
\ No newline at end of file
src/views/actualCombat/detail.vue
View file @ 10c4eb8c
<template>
<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">{{formData.productName}}</div>
</div>
<div class="top-box">
<div class="typeList">
<div class="type-box">
<span>激进型</span>
<span>{{formData.tradeStyleName}}</span>
</div>
<div class="type-box">
<span>中风险</span>
<span>{{formData.riskManagementName}}</span>
</div>
<span class="numberPeople">117人已订阅</span>
<span class="numberPeople">{{formData.memberNumber}}人已订阅</span>
</div>
<span class="profit">总收益</span>
<span class="percentage">40.27%</span>
<span class="percentage">{{formData.yields*100}}%</span>
<!-- 线 -->
<div class="line"></div>
......@@ -41,29 +54,29 @@
<span>-10.83%</span>
</div> -->
<div class="tab-box-Two">
<span>-10.83%</span>
<span>{{formData.monthlyBackYields*100}}%</span>
</div>
<div class="tab-box-Two">
<span>-10.83%</span>
<span>{{formData.position}}%</span>
</div>
<div class="tab-box-Two">
<span>-10.83%</span>
<span>{{backYields*100}}%</span>
</div>
<div class="tab-box-Two">
<span>-10.83%</span>
<span>{{formData.successPercent*100}}%</span>
</div>
</div>
</div>
<div class="title-box">
<span class="title-text">08-14 11:12 | 当⼊选002583⼤涨5.10%</span>
<!-- <span class="title-text">08-14 11:12 | 当⼊选002583⼤涨5.10%</span> -->
</div>
<!-- 分析师姓名 -->
<div class="infoBox">
<span class="infoName">姓名</span>
<span class="infoList">简介减价二发生的该方法根据官方回复人很多家庭一款基于</span>
<span class="infoName">{{formData.analystName}}</span>
<span class="infoList">{{formData.comments}}</span>
<div class="infoType">
<span >#金牌投顾</span>
<span >#{{formData.accountTypeName}}</span>
</div>
</div>
......@@ -76,13 +89,14 @@
color:gray;
margin-top: 0.4rem;
margin-left: 3rem;
line-height: 1rem;">
line-height: 1rem;" @click="jumpAbnomal()">
<span>查看更多</span><van-icon name="arrow" />
</div>
</div>
<!-- 点评信息 -->
<div class="reviewInfo">
<span>{{abnoMalcomments}}</span>
</div>
<div style="width:100%;height:1rem;display:flex">
<div class="analystTwo">
......@@ -93,7 +107,7 @@
width: 109%;
margin-top: 0.6rem;
line-height: 1rem;">
<van-radio-group v-model="radio" direction="horizontal">
<van-radio-group v-model="radio" direction="horizontal" @change="clickMonth">
<van-radio name="1" icon-size="12px" checked-color="#ee0a24">近一月</van-radio>
<van-radio name="2" icon-size="12px" checked-color="#ee0a24">近三月</van-radio>
<van-radio name="3" icon-size="12px" checked-color="#ee0a24">近一年</van-radio>
......@@ -109,30 +123,30 @@
<div class="profitBox">
<div class="profitLeft">
<span class="profitTitle">收益率:</span>
<span class="profitNumber">40.27%</span>
<span class="profitNumber">{{formData.yields*100}}%</span>
</div>
<div class="profitright">
<span class="profitTitle">总收益:</span>
<span class="profitNumberTwo">402697.6</span>
<span class="profitNumberTwo">{{formData.totalRevenue}}</span>
</div>
</div>
<div class="profitBoxTwo" style="margin-top:-0.3rem">
<div class="profitLeft">
<span class="profitTitle">初始资金:</span>
<span class="profitNumber">10000000.00</span>
<span class="profitNumber">{{formData.initMoney}}</span>
</div>
<div class="profitright">
<span class="profitTitle">仓位:</span>
<span class="profitNumberTwo">26.35%</span>
<span class="profitNumberTwo">{{formDataThree.positionPercent*100}}%</span>
</div>
</div>
<div class="profitBoxTwo" style="margin-top:0.3rem">
<div class="profitLeft">
<span class="profitTitle">可用资金:1033097.60</span>
<span class="profitTitle">可用资金:{{formData.currentMoney}}</span>
<!-- <span class="profitNumber">10000000.00</span> -->
</div>
<div class="profitright">
<span class="profitTitle">股票市值:369600.00</span>
<span class="profitTitle">股票市值:{{formDataThree.currentAmount}}</span>
<!-- <span class="profitNumberTwo">26.35%</span> -->
</div>
</div>
......@@ -158,14 +172,22 @@
</div>
<!-- 已售罄 -->
<div class="soldOut">
<div class="soltBox">
<span>已售罄</span>
<div class="soltBox" v-if="isBuy==2">
<!-- <span>已售罄</span> -->
<img style="height: 1rem;
margin-top: 0.2rem;" src="../../assets/sure.png" alt="">
</div>
<div v-if="isBuy==1" class="soldText">
<span>{{formDataThree.count}}</span>
</div>
<div v-if="isBuy==1" class="soldText">
<span>{{formDataThree.costPrice}}</span>
</div>
<div class="soldText">
<span>-1.12%</span>
<span>{{formDataThree.yieldsAmount}}</span>
</div>
<div class="soldText">
<span>26.35%</span>
<span>{{formDataThree.positionPercent*100}}%</span>
</div>
</div>
<div class="analystTwo">
......@@ -184,7 +206,7 @@
height: 1rem;
margin-top: 0.4rem;
margin-left: 3rem;
line-height: 1rem;">
line-height: 1rem;" @click="jumpRecord()">
<span>交易记录</span><van-icon name="arrow" />
</div>
</div>
......@@ -212,24 +234,29 @@
</div>
</div>
<div class="contect-list">
<div class="mai">
<div v-if="formDataTwo.direction==1" class="maiTwo">
<span >买</span>
</div>
<div v-if="formDataTwo.direction==2" class="mai">
<span >卖</span>
</div>
<div class="contectSold" @click="showPopup">
<span>已售罄</span>
<div class="contectSold" v-if="isBuy==2" @click="showPopup">
<!-- <span>已售罄</span> -->
<img style="height: 1rem;
margin-top: 0.2rem;" src="../../assets/sure.png" alt="">
</div>
<!-- <div class="contectBox">
<span>300***</span>
<div class="contectBox" v-if="isBuy==1">
<span>{{formDataTwo.count}}</span>
</div>
<div class="contectBox" v-if="isBuy==1">
<span>{{formDataTwo.price}}</span>
</div>
<div class="contectBox">
<span>*</span>
</div> -->
<div class="contectBox">
<span>100%</span>
<span>{{formDataTwo.remark*100}}%</span>
</div>
<div class="contectBox">
<span style="display:block;height:0.5rem;margin-top:-0.3rem">08/26</span>
<span>14:28</span>
<span style="display:block;height:0.5rem;margin-top:-0.3rem">{{state_type(formDataTwo.created_TIME)}}</span>
<span>{{state_typeTwo(formDataTwo.created_TIME)}}</span>
</div>
</div>
......@@ -304,9 +331,16 @@ export default {
radio:'1',
radio2:'1',
show:false,
isBuy:2,
morePoint:12345,
list: [],
formData:{},
formDataTwo:{},
formDataThree:{},
ifexchange:true,
backYields:0,
startDate:this.getLastMonth(1),
endDate:this.getLastMonth(),
checkList:[
{
id:'1',
......@@ -329,13 +363,193 @@ export default {
point:'1222',
}
],
abnoMalcomments:'',
echartsOption: { // echarts选项，所有绘图数据和样式都在这里设置
},
chart: null,
_thisForChart: null,
_thisForWindow: null,
colorItem: {
// "北京": '#ff6161',
// "上海": '#e0815b',
// "广州": '#ffaf33',
// "深圳": '#637be6',
// "成都": '#a1b2ff'
// "西安": '#b3daff',
},
echartData:[
// {
// name:'北京',
// value: '2',
// },
// {
// name:'上海',
// value: '3',
// },
// {
// name:'广州',
// value: '6',
// },
// {
// name:'深圳',
// value: '7',
// },
// {
// name:'成都',
// value: '5',
// },
// {
// name:'西安',
// value: '9',
// },
]
};
},
mounted(){
this.getFollowAccountIndustryPercent()
this.getList()
this.getFollowAccountYieldsRecords()
},
beforeDestroy () {
this.removeEventListenerToSidebarContainer()
this.removeEventListenerToWindowResize()
// this.getFollowAccountYieldsRecords()
},
methods: {
// ...mapMutations("store_modular", ["operation"]),
getList() {
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
this.server.followaccountDetail(temp).then((res) =>{
this.formData=res.data.data
this.formData.position=parseFloat(res.data.data.position)*100
this.clickTab()
this.getAbnomalList()
this.getAcountList()
this.queryFollowAccountPositions()
// this.list.forEach((i,index)=>{
// if(i.comments.length<=48){
// i.ifMore=false
// }else{
// i.ifMore=true
// }
// })
})
// this.$toast.loading({
// message: '加载中...',
// forbidClick: true,
// duration:0
// });
},
//行业占比信息
getFollowAccountIndustryPercent(){
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
this.server.getFollowAccountIndustryPercent(temp).then((res)=>{
this.echartData=res.data.data
// let list=res.data.data
this.echartData.forEach((i,intem)=>{
i.name=i.typeName
i.value=i.stockNumber
})
console.log("我的数据",this.echartData)
this.$nextTick(() => {
this.initPieChart();
this.addEventListenerToSidebarContainer(this)
this.addEventListenerToWindowResize(this)
});
// console.log("好好哄",res.data.data.list)
// this.profitList=res.data.data.list
// res.data.data.list.forEach((i,item)=>{
// if(i.id==this.$route.query.id){
// this.backYields=i.backYields
// this.isBuy=i.isBuy
// }
// })
// if()
// if(this.index)
})
},
//点击选择月份
clickMonth(val){
console.log("选择月份",val)
if(val==1){
this.startDate= this.getLastMonth(1)
}else if(val==2){
this.startDate= this.getLastMonth(3)
}else if(val==3){
this.startDate= this.getLastMonth(12)
}else if(val==4){
// startDate= this.getLastMonth(60)
this.startDate='1970-01-01'
// this.startDate=''
}
this.endDate=this.getLastMonth()
this.getFollowAccountYieldsRecords()
// console.log("最近一个月",startDate)
},
getLastMonth(val) {
console.log("选择士大夫月份",val)
const now = new Date(); // 当前日期
if(val==1){
now.setMonth(now.getMonth() - 1); // 设置为一个月前的日期
}else if(val==3){
now.setMonth(now.getMonth() - 3); // 设置为一个月前的日期
}else if(val==12){
now.setMonth(now.getMonth() - 12); // 设置为一个月前的日期
}else if(val==60){
now.setMonth(now.getMonth() - 60); // 设置为一个月前的日期
}
return now.toISOString().split('T')[0]; // 将日期转换为年月日格式
},
//曲线图列表
getFollowAccountYieldsRecords(){
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100,
startDate:this.startDate,
endDate:this.endDate
}
var monthList=[]
var yiledList=[]
this.server.getFollowAccountYieldsRecords(temp).then((res)=>{
// console.log("真么呀这是哈总二",this.echartsOption)
res.data.data.forEach((i,index)=>{
i.created_TIME= this.state_typeThree(i.created_TIME)
i.yields=i.yields*100
monthList.push(i.created_TIME)
yiledList.push(i.yields)
})
console.log("我来看看月份集合",monthList)
console.log("我来看看收益集合",yiledList)
// this.echartsOption.xAxis.data=monthList
// this.echartsOption.series[0].data=['1%','7%']
let echartsOption={
legend: { //图表上方的图例
data: ['腾讯', '阿里巴巴', '华为', '字节跳动']
data: ['累计收益']
},
xAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], // x轴数据
data: monthList, // x轴数据
// name: '日期', // x轴名称
nameTextStyle: { // x轴名称样式
fontWeight: 600,
......@@ -345,6 +559,9 @@ export default {
yAxis: {
type: 'value',
position:'right',
axisLabel : {
formatter: '{value}%'
},
// name: '市值', // y轴名称
nameTextStyle: { // y轴名称样式
fontWeight: 600,
......@@ -356,72 +573,173 @@ export default {
},
series: [ //每条折线的数据系列
{
name: '腾讯',
data: [820, 932, 901, 934, 1290, 1330, 1320],
type: 'line'
name: '累计收益',
data: yiledList,
axisLabel : {
formatter: '{value}%'
},
{
name: '阿里巴巴',
data: [620, 711, 823, 934, 1445, 1456, 1178],
// formatter: '{value}%',
type: 'line'
}
]
}
let myChartTwo = echarts.dispose(document.getElementById('myChart'))
let myChart = echarts.init(document.getElementById('myChart'), 'light') // 初始化echarts, theme为light
myChart.setOption(echartsOption) // echarts设置选项
// console.log("好好哄",res.data.data.list)
// // this.profitList=res.data.data.list
// res.data.data.list.forEach((i,item)=>{
// if(i.id==this.$route.query.id){
// this.backYields=i.backYields
// this.isBuy=i.isBuy
// }
// })
// if()
// if(this.index)
})
},
{
name: '华为',
data: [612, 920, 1140, 1160, 1190, 1234, 1321],
type: 'line'
//跳转到异动点评
jumpAbnomal(){
this.$router.push({
path: '/abnormalReview',
query: {
id:this.$route.query.id
}
});
},
{
name: '字节跳动',
data: [234, 320, 453, 567, 789, 999, 1200],
type: 'line'
//跳转到调仓记录
jumpRecord(){
this.$router.push({
path: '/actualCombatRecord',
query: {
id:this.$route.query.id
}
],
});
},
chart: null,
_thisForChart: null,
_thisForWindow: null,
colorItem: {
"北京": '#ff6161',
"上海": '#e0815b',
"广州": '#ffaf33',
"深圳": '#637be6',
"成都": '#a1b2ff'
// "西安": '#b3daff',
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
},
mounted(){
let myChart = echarts.init(document.getElementById('myChart'), 'light') // 初始化echarts, theme为light
myChart.setOption(this.echartsOption) // echarts设置选项
this.$nextTick(() => {
this.initPieChart();
this.addEventListenerToSidebarContainer(this)
this.addEventListenerToWindowResize(this)
});
state_typeThree(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 = Year+'-'+ Moth + '-' + Day
return GMT
},
beforeDestroy () {
this.removeEventListenerToSidebarContainer()
this.removeEventListenerToWindowResize()
//获取首页列表数据，补充详情不足数据
clickTab(){
// this.tabIndex=index
// this.tableName=name
let temp={
page:1,
pageSize:10,
orderByColumn:'yields',
orderByDirection:'desc'
}
this.server.followaccount(temp).then((res)=>{
// console.log("好好哄",res.data.data.list)
// this.profitList=res.data.data.list
res.data.data.list.forEach((i,item)=>{
if(i.id==this.$route.query.id){
this.backYields=i.backYields
this.isBuy=i.isBuy
}
})
// if()
// if(this.index)
})
},
methods: {
...mapMutations("store_modular", ["operation"]),
getList() {
this.server
.getListAPI({ num: this.num })
.then((res) => (this.list = res.data.data))
.catch((err) => console.log(err))
.finally(()=>{this.$toast.clear()});
if(this.num==0){
this.$toast.fail("数量不能为0");
return
//异动点评列表
getAbnomalList(){
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
// this.$toast.loading({
// message: '加载中...',
// forbidClick: true,
// duration:0
// });
this.server.queryFollowAccountReviews(temp).then((res) =>{
this.abnoMalcomments=res.data.data.list[0].comments
// this.list=res.data.data.list
// this.list.forEach((i,index)=>{
// if(i.comments.length<=48){
// i.ifMore=false
// }else{
// i.ifMore=true
// }
// })
})
},
//调仓记录列表
getAcountList(){
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
this.server.followAccountZfzt(temp).then((res) =>{
this.formDataTwo=res.data.data.list[0]
// var num = "3.1415926";
// var parsedNum = parseFloat(num);
// var roundedNum = parsedNum.toFixed(2);
var a=parseFloat(res.data.data.list[0].remark)
this.formDataTwo.remark= Math.round(a * 100) / 100
// parseFloat(res.data.data.position)*100
// this.list=res.data.data.list
// this.list.forEach((i,index)=>{
// i.remark=parseFloat(i.remark)*100
// })
})
},
//持仓配置列表
queryFollowAccountPositions(){
let temp={
followAccountId:this.$route.query.id,
page:1,
pageSize:100
}
this.server.queryFollowAccountPositions(temp).then((res) =>{
this.formDataThree=res.data.data[0]
// })
})
},
//选择积分
clickBox(val){
......@@ -436,37 +754,16 @@ let myChart = echarts.init(document.getElementById('myChart'), 'light') // 初
}
}
})
},
tab_oimg: function () {
this.$router.push("../actualCombat");
},
showPopup(){
this.show=true
},
initPieChart () {
let echartData = [
{
name:'北京',
value: '0.99',
},
{
name:'上海',
value: '0.29',
},
{
name:'广州',
value: '0.44',
},
{
name:'深圳',
value: '0.14',
},
{
name:'成都',
value: '0.21',
},
// {
// name:'西安',
// value: '0.77',
// },
]
let echartData =this.echartData
var chartDom = document.getElementById('pieChart1');
this.chart = echarts.init(chartDom);
let handleEchartData = echartData .map((item3) => {
......@@ -524,13 +821,20 @@ let myChart = echarts.init(document.getElementById('myChart'), 'light') // 初
},
formatter: function(name) {
let value
var sum = echartData.reduce(function(acc, obj) {
return acc + Number(obj.value) ;
}, 0);
for (let i = 0; i < echartData.length; i++) {
if (echartData[i].name === name) {
if (echartData[i].name == name) {
value = echartData[i].value
}
}
console.log("看看总数",sum)
var val = value
return [`{name|${name}}` + '：' + `{value|${val}%}`]
var a=(val/sum*100).toFixed(2)
return [`{name|${name}}` + '：' + `{value|${a}%}`]
},
},
series: [
......@@ -792,6 +1096,21 @@ line-height: 1rem;
font-size: 0.5rem;
/* font-weight: bold; */
}
.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;
}
.analystTwo{
height: 0.8rem;
line-height: 0.8rem;
......@@ -824,12 +1143,13 @@ margin: auto;
display: flex;
}
.reviewInfo{
width: 94%;
height: 4rem;
font-size: 0.3rem;
/* color: white; */
margin: 0.7rem auto;
background-color:yellowgreen ;
width: 91%;
height: 4rem;
font-size: 0.3rem;
/* color: white; */
padding-left: 0.6rem;
margin: 0.7rem auto;
/* background-color: yellowgreen; */
}
#myChart{
......@@ -845,7 +1165,7 @@ font-size: 0.3rem;
/* color: white; */
margin: 0.7rem auto;
display: flex;
background-color:yellowgreen ;
/* background-color:yellowgreen ; */
}
.profitBoxTwo{
width: 94%;
......@@ -854,17 +1174,17 @@ font-size: 0.3rem;
/* color: white; */
margin: 0 auto;
display: flex;
background-color:yellowgreen ;
/* background-color:yellowgreen ; */
}
.profitLeft{
width: 50%;
height: 100%;
background-color: royalblue;
/* background-color: royalblue; */
}
.profitright{
width: 50%;
height: 100%;
background-color: yellow;
/* background-color: yellow; */
}
.profitTitle{
display: block;
......@@ -894,7 +1214,7 @@ display: flex;
.soltBox{
width: 50%;
height: 100%;
background-color:gray ;
/* background-color:gray ; */
color: white;
text-align: center;
line-height: 1.2rem;
......@@ -925,7 +1245,7 @@ line-height: 1.5rem;
.contectSold{
height: 100%;
width: 40%;
background: gray;
/* background: gray; */
border-radius: 0.2rem;
color: white;
text-align: center;
......@@ -1008,4 +1328,15 @@ right: 0;
font-size: 0.4rem;
margin: 3rem auto;
}
.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%;
}
</style>
\ No newline at end of file
src/views/actualCombat/index.vue
View file @ 10c4eb8c
......@@ -19,7 +19,7 @@
</div>
<!-- 卡片盒子 -->
<div class="card-box">
<div class="left-card">
<div class="left-card" @click="jumpDetail(profitIdTwo)">
<div class="card-title">
<span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
<span style="display:block;font-size:0.5rem;">{{profitSecond*100}}%</span>
......@@ -31,7 +31,7 @@
<span v-if="isBuyFirst==1" class="clickBtnGray" >已兑换</span>
</div>
<div class="center-card">
<div class="center-card" @click="jumpDetail(profitIdFirst)">
<div class="card-title">
<span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
<span style="display:block;font-size:0.5rem;">{{profitFirst*100}}%</span>
......@@ -42,7 +42,7 @@
<span v-if="isBuyTwo==2" class="clickBtn" @click="showPopup(profitIdFirst)">兑换解锁</span>
<span v-if="isBuyTwo==1" class="clickBtnGray" >已兑换</span>
</div>
<div class="rigth-card">
<div class="rigth-card" @click="jumpDetail(profitThree)">
<div class="card-title">
<span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
<span style="display:block;font-size:0.5rem;">{{profitThree*100}}%</span>
......@@ -56,7 +56,7 @@
</div>
<!-- 内容盒子 -->
<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="top-left">
<span style="display:block;font-size:0.5rem">{{i.productName}}</span>
......@@ -236,6 +236,15 @@ this.clickTab('yields','总收益')
this.checkList=res.data.data
})
},
//跳转到详情页
jumpDetail(id){
this.$router.push({
path: '/detail',
query: {
id:id
}
});
},
//点击标签页
clickTab(index,name){
console.log()
......
src/views/actualCombat/record.vue
View file @ 10c4eb8c
<template>
<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="tab-box">
<span>买/卖</span>
......@@ -22,22 +34,26 @@
<div class="line">
</div>
<div class="contect-list">
<div class="mai">
<div v-for="i in list" :key="i.code">
<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>
</div>
<div class="contectBox">
<span>300***</span>
<span>{{i.count}}</span>
</div>
<div class="contectBox">
<span>*</span>
<span>{{i.price}}</span>
</div>
<div class="contectBox">
<span>100%</span>
<span>{{i.remark.toFixed(2)}}%</span>
</div>
<div class="contectBox">
<span style="display:block;height:0.5rem;margin-top:-0.3rem">08/26</span>
<span>14:28</span>
<span style="display:block;height:0.5rem;margin-top:-0.3rem">{{state_type(i.created_TIME)}}</span>
<span>{{state_typeTwo(i.created_TIME)}}</span>
</div>
</div>
<!-- 灰线 -->
......@@ -45,6 +61,8 @@
</div>
</div>
</div>
</template>
<script>
......@@ -61,9 +79,72 @@ export default {
list: [],
};
},
mounted(){
this.getList()
},
methods: {
// ...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 {
height: 1.2rem;
width: 100%;
display: flex;
background-color: yellow;
/* background-color: yellow; */
}
.tab-box{
width: 20%;
......@@ -83,7 +164,7 @@ height: 100%;
text-align: center;
line-height: 1.2rem;
font-size: 0.35rem;
background-color: aquamarine;
/* background-color: aquamarine; */
}
.line{
width: 100%;
......@@ -99,7 +180,7 @@ background-color: aquamarine;
display: flex;
height: 1.5rem;
width: 100%;
background-color: yellowgreen;
/* background-color: yellowgreen; */
font-size: 0.5rem;
}
.contectBox{
......@@ -120,4 +201,30 @@ line-height: 1.5rem;
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>
\ No newline at end of file
vue.config.js
View file @ 10c4eb8c
......@@ -10,6 +10,9 @@ module.exports = defineConfig({
port: 8080,
hot: true,
https: false,
client: {
overlay: false,
},
proxy: { //配置多个代理
"/testIp": {
target: "http://197.0.0.1:8088",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment