From e3097587828362e34352cf4f378c8f5a260ea700 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Thu, 19 Sep 2024 16:32:00 +0800
Subject: [PATCH] no message
---
src/page/user/Warehouse/data.list.vue | 332 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 287 insertions(+), 45 deletions(-)
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 37d2378..9e2e759 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -14,28 +14,49 @@
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 class="title-box">
- <div class="span">{{ item.stockName }}</div>
- <div class="states">{{ item.orderDirection }}</div>
+ @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="12">
+ <van-col span="8">
<div style="text-align: left">
- <div class="sport-content-title2">{{ $t("盈虧") }} (USD)</div>
- <div class="sport-content-text" style="color: #d04b64">
- {{ item.profitAndLose }}
+ <div class="sport-content-title2">
+ {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
- </div></van-col
- >
- <van-col span="12">
+ <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>
@@ -45,20 +66,32 @@
<van-row>
<van-col span="8">
<div style="text-align: left">
- <div class="sport-content-title2">{{ $t("hj40") }}(USD)</div>
- <div class="sport-content-text2">{{ item.now_price }}</div>
+ <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("持倉價") }} (USD)</div>
- <div class="sport-content-text2">{{ item.buyOrderPrice }}</div>
+ <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("訂單金額") }} (USD)</div>
- <div class="sport-content-text2">{{ item.orderTotalPrice }}</div>
+ <div class="sport-content-title2">
+ {{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderTotalPrice | _toLocaleString }}
+ </div>
</div>
</van-col>
</van-row>
@@ -66,47 +99,187 @@
<van-col span="8">
<div style="text-align: left">
<div class="sport-content-title2">
- {{ $t("開倉手續費") }} (USD)
+ {{ $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("止損價") }} (USD)</div>
+ <div class="sport-content-title2">
+ {{ $t("止損價") }} ({{ activeObj.symbolCode }})
+ </div>
<div class="sport-content-text2">
- -{{ item.profitTargetPrice || "--" }}
+ {{ item.stopTargetPrice | _toLocaleString }}
</div>
</div>
</van-col>
<van-col span="8">
<div style="text-align: right">
- <div class="sport-content-title2">{{ $t("止盈價") }} (USD)</div>
+ <div class="sport-content-title2">
+ {{ $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>
<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 class="sport-content-text2">{{ item.buyOrderId }}</div>
</div>
</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>
@@ -123,7 +296,7 @@
</div>
<div class="hang">
<div class="left">{{ $t("買漲/買跌") }}</div>
- <div class="right">{{ closeSell.orderDirection }}</div>
+ <div class="right">{{ $t(closeSell.orderDirection) }}</div>
</div>
<div class="hang">
<div class="left">{{ $t("倉位(股)") }}</div>
@@ -153,16 +326,21 @@
default: {},
},
},
+ mounted() {
+ this.getList();
+ },
data() {
return {
pageNum: 1,
- pageSize: 15,
+ pageSize: 150,
loading: true,
finished: false,
closeSell: {},
show: false,
actives: 0,
dataList: [],
+ newdataList:[],
+ timer: null,
tabsList: [
{
title: this.$t("持倉"),
@@ -176,11 +354,44 @@
],
};
},
+ created(){
+ this.dsq()
+ },
+ beforeDestroy() {
+ clearInterval(this.timer); // 在组件销毁前清除定时器
+ },
methods: {
+ dsq(){
+ // this.dataList = [];
+ this.timer = setInterval(() => {
+ this.getList();
+ }, 3000);
+ },
+ pushRouter(item) {
+ const obj = {
+ pid: item.stockCode || "",
+ type: item.stockGid || "",
+ };
+ window.localStorage.setItem("kLine", JSON.stringify(obj));
+ // return;
+ var codes = item.stockCode;
+ var names = item.stockName;
+
+ this.$router.push({
+ path: "/kline",
+ query: {
+ name: names,
+ code: codes,
+ if_us: "",
+ if_zhishu: 0,
+ sok: "",
+ type: item.stockGid,
+ },
+ });
+ },
onLoad() {
- this.pageNum++;
+ // this.pageNum++;
this.loading = true;
- this.getList();
},
async confirm() {
const res = await sell({
@@ -192,12 +403,13 @@
this.pageNum = 1;
this.finished = false;
this.getList();
+ this.$emit("closingPosition");
} else {
Notify({ type: "danger", message: res.msg });
}
},
+ // 获取仓位列表
async getList(laber) {
- console.log(laber);
if (laber) {
this.dataList = [];
this.pageNum = 1;
@@ -206,19 +418,25 @@
const res = await getchicang({
state: this.actives,
stockType: laber || this.activeObj.laber,
- pageNum: this.pageNum,
- pageSize: this.pageSize,
+ pageNum: 1,
+ pageSize: 100,
});
- if (res.data.total <= this.dataList.length) {
- this.finished = true;
- }
+
this.loading = false;
if (res.status === 0) {
- if (this.pageNum !== 1) {
- this.dataList = [...this.dataList, ...res.data.list];
- } else {
+ 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;
this.finished = true;
@@ -233,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()
+ // }
},
},
};
@@ -307,6 +544,11 @@
background: rgba(3, 173, 143, 0.15);
flex-shrink: 0;
font-weight: 900;
+ }
+
+ .states-red {
+ background: rgba(208, 75, 100, 0.15);
+ color: rgb(208, 75, 100);
}
}
@@ -387,4 +629,4 @@
text-align: right;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3