st-comp 0.0.40 → 0.0.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/packages/Kline/utils.ts

@@ -538,9 +538,18 @@ const handleSellBuyConfig = (data: any[], originData: KlineDataType) => {
      * 因为传入参数数据时,已经对数据进行了合并处理,不会出现例如: 两个平空数据于一条K线上,这种情况,所以
      * 简单判断该条K线上是否有多个数据即可判断出是否是买卖同时存在,如果同时存在图标变成T
      */
-    let symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
-    if (data.filter((item: any) => item.time === next.time).length > 1) {
-      symbol = "image://" + new URL("./images/t.svg", import.meta.url).href;
+    const timeTradeList = data.filter((item: any) => item.time === next.time)
+        let symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
+    if (timeTradeList.length > 1) {
+      // 存在多条数据, 处理出他们的交易类型, 进行去重
+      const timeTradeTypes = [...new Set(timeTradeList.map(i => handleTradeType(i, "sellBuy")))]
+      if (timeTradeTypes.length > 1) {
+        symbol = "image://" + new URL("./images/t.svg", import.meta.url).href;
+      } else {
+        symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
+      }
+    } else {
+      symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
     }
     // 3.获取对应Y轴值
     const originDataItem = originData.find((item: any) => item[0] === next.time) ?? [];

package/src/pages/Kline/api.ts

@@ -7,9 +7,9 @@ export const getSingleCycleSingleVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: '9593c16255001925afeed6dd2770eea7',
+      token: '4b26c72f990a5b02be1a79eb33c1bedf',
     },
-    url: 'http://192.168.12.49:88/common/qt/getSingleCycleSingleVariety',
+    url: 'http://120.27.237.138/common/qt/getSingleCycleSingleVariety',
     data,
   })
 }
@@ -63,9 +63,9 @@ export const getNetPositionData = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: 'b1ef55eb206f7ae49b85b528231c5d87',
+      token: '4b26c72f990a5b02be1a79eb33c1bedf',
     },
-    url: 'http://192.168.12.49:88/invest/analysis/queryVarietyNetPositionValue',
+    url: 'http://120.27.237.138/invest/analysis/queryVarietyNetPositionValue',
     data
   })
 }
@@ -77,9 +77,9 @@ export const queryPairedRecordByVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: 'b1ef55eb206f7ae49b85b528231c5d87',
+      token: '4b26c72f990a5b02be1a79eb33c1bedf',
     },
-    url: 'http://192.168.12.49:88/invest/analysis/queryPairedRecordByVariety',
+    url: 'http://120.27.237.138/invest/analysis/queryPairedRecordByVariety',
     data
   })
 }

package/src/pages/Kline/components/SingleCycleSingleVariety.vue

@@ -22,7 +22,7 @@ const loading = ref(true);
 const netWorkErrorMsg = ref("");
 
 // 筛选条件相关参数
-const cycle = ref<any>("6");
+const cycle = ref<any>("5");
 const cycleName = computed(() => {
   if (cycleOptions.value.length > 0) {
     return cycleOptions.value.find((item: any) => item.value === cycle.value).label;
@@ -191,12 +191,12 @@ const getKlineData = async () => {
   const params = {
     contractType: 0,
     cycle: cycle.value,
-    endTime: "2021-01-23 00:00:00",
+    endTime: "2024-03-28 15:00:00",
     preLimit: 800,
     queryType: 0,
     right: 0,
-    startTime: "2020-12-23 00:00:00",
-    variety: "FU",
+    startTime: "2024-01-28 15:00:00",
+    variety: "RU",
   };
   const res = await getSingleCycleSingleVariety(params);
   klineData.value = res.data.body;
@@ -207,10 +207,10 @@ const getKlineData = async () => {
 const getKlinePointData = async () => {
   // ------
   const params = {
-    analyseId: 2229,
+    analyseId: 3172,
     cycle: cycle.value,
     ifStock: 0,
-    varietyName: "燃料油",
+    varietyName: "橡胶",
   };
   const res = await queryPairedRecordByVariety(params);
   const body = res.data.body;