From ab3e84ca5e0aedf77bb2fc390be8a468ebb72cba Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Thu, 01 Aug 2024 18:15:45 +0800
Subject: [PATCH] 1
---
src/page/user/Warehouse/data.list.vue | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 212 insertions(+), 25 deletions(-)
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 2625a9f..9e2e759 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -14,16 +14,17 @@
v-model="loading"
:finished="finished"
:finished-text="$t('hj43')"
+ :loading-text="$t('hj430')"
@load="onLoad"
>
- <div
+ <div v-if="actives === 0"
class="sport-content-li"
:style="actives === 1 ? 'height:5.52rem' : 'height:7.52rem'"
v-for="(item, index) in dataList"
:key="index"
- >
- <div @click="pushRouter(item)">
- <div class="title-box">
+ @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)" >
+ <div @click.stop="pushRouter(item)">
+ <div class="title-box" style="justify-content: space-between;">
<div class="span">{{ item.stockName }}</div>
<div
class="states"
@@ -32,7 +33,7 @@
{{ $t(item.orderDirection) }}
</div>
</div>
- {{ item.stockCode }}
+ {{ item.stockSpell }}
</div>
<van-row>
<van-col span="8">
@@ -40,8 +41,8 @@
<div class="sport-content-title2">
{{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text" style="color: #d04b64">
- {{ item.profitAndLose }}
+ <div class="sport-content-text" >
+ ₹{{ item.profitAndLose | _toLocaleString }}
</div>
</div>
</van-col>
@@ -68,7 +69,9 @@
<div class="sport-content-title2">
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.now_price }}</div>
+ <div class="sport-content-text2">
+ ₹{{ item.now_price | _toLocaleString }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -76,7 +79,9 @@
<div class="sport-content-title2">
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.buyOrderPrice }}</div>
+ <div class="sport-content-text2">
+ ₹{{ item.buyOrderPrice | _toLocaleString }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -84,7 +89,9 @@
<div class="sport-content-title2">
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.orderTotalPrice }}</div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderTotalPrice | _toLocaleString }}
+ </div>
</div>
</van-col>
</van-row>
@@ -92,18 +99,20 @@
<van-col span="8">
<div style="text-align: left">
<div class="sport-content-title2">
- {{ $t("開倉手續費") }} ({{ activeObj.symbolCode }})
+ {{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.orderFee }}</div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderFee | _toLocaleString }}
+ </div>
</div>
</van-col>
- <van-col span="8">
+ <!-- <van-col span="8">
<div style="text-align: center">
<div class="sport-content-title2">
{{ $t("止損價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- -{{ item.profitTargetPrice || "--" }}
+ {{ item.stopTargetPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -113,17 +122,17 @@
{{ $t("止盈價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- -{{ item.stopTargetPrice || "--" }}
+ {{ item.profitTargetPrice | _toLocaleString }}
</div>
</div>
- </van-col>
+ </van-col> -->
</van-row>
<van-row>
<van-col span="12">
<div style="text-align: left">
<div class="sport-content-title2">{{ $t("持倉時間") }}</div>
<div class="sport-content-text2">
- {{ $moment(item.buyOrderTime).format("YYYY-MM-DD HH:mm:ss") }}
+ {{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
</div>
</div>
</van-col>
@@ -135,8 +144,142 @@
</van-col>
</van-row>
- <div class="but-box" v-if="actives === 0">
- <div class="but" @click="close(item)">{{ $t("平仓") }}</div>
+ <div class="but-box" v-if="actives === 0" @click.stop="close(item)">
+ <div class="but">{{ $t("平仓") }}</div>
+ <!-- <div class="but buts">止盈止损</div> -->
+ </div>
+ </div>
+
+
+ <div v-if="actives === 1"
+ class="sport-content-li"
+ :style="actives === 1 ? 'height:5.52rem' : 'height:7.52rem'"
+ v-for="(item, index) in newdataList"
+ :key="index"
+ @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)" >
+ <div @click.stop="pushRouter(item)">
+ <div class="title-box" style="justify-content: space-between;">
+ <div class="span">{{ item.stockName }}</div>
+ <div
+ class="states"
+ :class="item.orderDirection === '买跌' ? 'states-red' : ''"
+ >
+ {{ $t(item.orderDirection) }}
+ </div>
+ </div>
+ {{ item.stockSpell }}
+ </div>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text" >
+ ₹{{ item.profitAndLose | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("hj141") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.profitAndLoseParent }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
+ <div class="sport-content-text">{{ item.orderNum }}</div>
+ </div></van-col
+ >
+ </van-row>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("hj40") }}({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.now_price | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("持倉價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.buyOrderPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">
+ {{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderTotalPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ </van-row>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("hj44") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderFee | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <!-- <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("止損價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.stopTargetPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">
+ {{ $t("止盈價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.profitTargetPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col> -->
+ </van-row>
+ <van-row>
+ <van-col span="12">
+ <div style="text-align: left">
+ <div class="sport-content-title2">{{ $t("持倉時間") }}</div>
+ <div class="sport-content-text2">
+ {{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="12">
+ <div style="text-align: right">
+ <div class="sport-content-title2">{{ $t("訂單編號") }}</div>
+ <div class="sport-content-text2">{{ item.buyOrderId }}</div>
+ </div>
+ </van-col>
+ </van-row>
+
+ <div class="but-box" v-if="actives === 0" @click.stop="close(item)">
+ <div class="but">{{ $t("平仓") }}</div>
<!-- <div class="but buts">止盈止损</div> -->
</div>
</div>
@@ -183,6 +326,9 @@
default: {},
},
},
+ mounted() {
+ this.getList();
+ },
data() {
return {
pageNum: 1,
@@ -193,6 +339,8 @@
show: false,
actives: 0,
dataList: [],
+ newdataList:[],
+ timer: null,
tabsList: [
{
title: this.$t("持倉"),
@@ -206,8 +354,19 @@
],
};
},
-
+ created(){
+ this.dsq()
+ },
+ beforeDestroy() {
+ clearInterval(this.timer); // 在组件销毁前清除定时器
+ },
methods: {
+ dsq(){
+ // this.dataList = [];
+ this.timer = setInterval(() => {
+ this.getList();
+ }, 3000);
+ },
pushRouter(item) {
const obj = {
pid: item.stockCode || "",
@@ -231,7 +390,7 @@
});
},
onLoad() {
- this.pageNum++;
+ // this.pageNum++;
this.loading = true;
},
async confirm() {
@@ -259,15 +418,24 @@
const res = await getchicang({
state: this.actives,
stockType: laber || this.activeObj.laber,
- pageNum: this.pageNum,
- pageSize: this.pageSize,
+ pageNum: 1,
+ pageSize: 100,
});
this.loading = false;
if (res.status === 0) {
- this.dataList = res.data.list;
+ if(this.actives == 0){
+ this.dataList = res.data.list;
+ }else{
+ this.newdataList = res.data.list;
+ }
+ this.$forceUpdate(); // 强制Vue重新渲染
// if (res.data.total <= this.dataList.length) {
this.finished = true;
+ // this.dsq()
+ // this.timer = setInterval(() => {
+ // this.getList();
+ // }, 3000);
// }
} else {
this.loading = false;
@@ -283,7 +451,26 @@
this.pageNum = 1;
this.finished = false;
this.actives = e.key;
- this.getList();
+ this.$forceUpdate(); // 强制Vue重新渲染
+ if(e.key==1){
+ clearTimeout(this.timer);
+ // setTimeout(()=>{
+ // clearInterval(this.timer); // 在组件销毁前清除定时器
+ // },3000)
+ this.getList()
+
+ }else{
+ this.dsq()
+ }
+
+ // this.getList()
+ // if(e.key !=this.actives){
+
+
+ // }else{
+ // this.actives = e.key;
+ // this.dsq()
+ // }
},
},
};
--
Gitblit v1.9.3