From e8b9f823dd93329eed3e9dc9a2964ac53734f4ee Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Thu, 23 May 2024 14:57:26 +0800
Subject: [PATCH] 部门要增加印股

---
 src/page/user/Warehouse.vue         |   20 ++++++++++
 src/locales/en.json                 |    6 ++
 src/locales/taiyu.json              |    4 +
 src/locales/zh.json                 |    4 +
 src/page/list/tradingList/tabs.vue  |    2 +
 src/locales/india.json              |    4 +
 src/components/elalert.vue          |   12 +++---
 src/locales/tw.json                 |    4 +
 src/locales/hanyu.json              |    4 +
 src/page/kline/components/kLine.vue |    2 
 src/locales/riyu.json               |    4 +
 11 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/components/elalert.vue b/src/components/elalert.vue
index 275f6df..0a3c6f5 100644
--- a/src/components/elalert.vue
+++ b/src/components/elalert.vue
@@ -1,10 +1,10 @@
 <!--  -->
 <template>
     <div v-if="$store.state.elAlertShow">
-        <el-alert  :closable="closable" :title="$store.state.elAlertText" :type="$store.state.elAlertType" center style="z-index:99999999999999999;position: fixed;top: 0;bottom: 0;margin: auto;">
+        <el-alert  :closable="closable" :title="$t($store.state.elAlertText)" :type="$store.state.elAlertType" center style="z-index:99999999999999999;position: fixed;top: 0;bottom: 0;margin: auto;">
     </el-alert>
     </div>
-    
+
 </template>
 
 <script>
@@ -45,11 +45,11 @@
     },
     //生命周期 - 创建完成(访问当前this实例)
     created() {
-        
+
     },
     //生命周期 - 挂载完成(访问DOM元素)
     mounted() {
-        
+
     },
     methods:{
         //定时调用父组件方法关闭弹窗
@@ -59,7 +59,7 @@
                 this.$emit('closeAlert')
             },2000)
         },
-        
+
     }
 }
 </script>
@@ -73,4 +73,4 @@
     position: absolute;
     top: 50%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 14fb942..5626b58 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -545,5 +545,9 @@
   "港股冻结": "Hong Kong stock freeze",
   "订单详情": "Order details",
   "港股總資產": "Hong Kong Stock Total Assets",
-  "贷款": "loan"
+  "一鍵平倉": "Close a position with one click",
+  "贷款": "loan",
+  "日股": "Japanese stocks",
+  "日股总资产": "Total assets of Japanese stocks",
+  "请登录": "please sign in"
 }
diff --git a/src/locales/hanyu.json b/src/locales/hanyu.json
index b0c0014..d8c3a5f 100644
--- a/src/locales/hanyu.json
+++ b/src/locales/hanyu.json
@@ -534,5 +534,7 @@
   "港股冻结": "홍콩 주식 동결",
   "订单详情": "주문 상세 정보",
   "港股總資產": "홍콩 주식 총자산",
-  "贷款": "대출"
+  "贷款": "대출",
+  "日股": "일본 주식",
+  "日股总资产": "일본 주식의 총자산"
 }
diff --git a/src/locales/india.json b/src/locales/india.json
index 2c3d448..fb4fe4e 100644
--- a/src/locales/india.json
+++ b/src/locales/india.json
@@ -545,5 +545,7 @@
   "订单详情": "ऑर्डर का विवरण",
   "港股總資產": "हांगकांग शेयरों की कुल संपत्ति",
   "一鍵平倉": "एक-क्लिक समापन",
-  "贷款": "ऋृण"
+  "贷款": "ऋृण",
+  "日股": "जापानी स्टॉक",
+  "日股总资产": "जापानी शेयरों की कुल संपत्ति"
 }
diff --git a/src/locales/riyu.json b/src/locales/riyu.json
index 9e44f44..11a7733 100644
--- a/src/locales/riyu.json
+++ b/src/locales/riyu.json
@@ -534,5 +534,7 @@
   "订单详情": "注文の詳細",
   "港股總資產": "香港株式総資産",
   "一鍵平倉": "ワンクリック平倉",
-  "贷款": "ローン"
+  "贷款": "ローン",
+  "日股": "日本株",
+  "日股总资产": "日本株の総資産額"
 }
diff --git a/src/locales/taiyu.json b/src/locales/taiyu.json
index 456dd01..bfd8119 100644
--- a/src/locales/taiyu.json
+++ b/src/locales/taiyu.json
@@ -534,5 +534,7 @@
   "订单详情": "รายละเอียดการสั่งซื้อ",
   "港股總資產": "สินทรัพย์รวมของหุ้นฮ่องกง",
   "一鍵平倉": "การปิดเพียงคลิกเดียว",
-  "贷款": "เงินกู้"
+  "贷款": "เงินกู้",
+  "日股": "หุ้นญี่ปุ่น",
+  "日股总资产": "สินทรัพย์รวมของหุ้นญี่ปุ่น"
 }
diff --git a/src/locales/tw.json b/src/locales/tw.json
index b5e9434..ddc53ea 100644
--- a/src/locales/tw.json
+++ b/src/locales/tw.json
@@ -539,5 +539,7 @@
   "订单详情": "訂單詳情",
   "港股總資產": "港股總資產",
   "一鍵平倉": "一鍵平倉",
-  "贷款": "貸款"
+  "贷款": "貸款",
+  "日股": "日股",
+  "日股总资产": "日股總資產"
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index e58c84b..ce9ae0b 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -534,5 +534,7 @@
   "订单详情": "订单详情",
   "港股總資產": "港股总资产",
   "一鍵平倉": "一鍵平倉",
-  "贷款": "贷款"
+  "贷款": "贷款",
+  "日股": "日股",
+  "日股总资产": "日股总资产"
 }
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index a4e1e27..0fb50de 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -922,7 +922,7 @@
 DefaultData.GetKLineOption = function () {
   var option = {
     Type: "历史K线图", // 创建图形类型
-    Language: 1, // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
+    Language: 'EN', // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
     // 窗口指标
     Windows: [
       { Index: "MA", Modify: true, Change: false, height: 20 },
diff --git a/src/page/list/tradingList/tabs.vue b/src/page/list/tradingList/tabs.vue
index 3e90ef0..c066057 100644
--- a/src/page/list/tradingList/tabs.vue
+++ b/src/page/list/tradingList/tabs.vue
@@ -58,6 +58,7 @@
         { title: this.$t("美股"), key: "US", name: "US" },
         { title: this.$t("港股"), key: "HK", name: "HK" },
         { title: this.$t("yg"), key: "IN", name: "IN" },
+        { title: this.$t("日股"), key: "JP", name: "JP" }
       ],
       zxtabsList: [
         // { title: this.$t("数字货币"), key: "1", name: "SZHB" },
@@ -66,6 +67,7 @@
         { title: this.$t("美股"), key: "US", name: "US" },
         { title: this.$t("港股"), key: "HK", name: "HK" },
         { title: this.$t("yg"), key: "IN", name: "IN" },
+        { title: this.$t("日股"), key: "JP", name: "JP" }
       ],
       active: "MAS",
       zxactive: "MAS",
diff --git a/src/page/user/Warehouse.vue b/src/page/user/Warehouse.vue
index 7811cf7..bd8c040 100644
--- a/src/page/user/Warehouse.vue
+++ b/src/page/user/Warehouse.vue
@@ -86,6 +86,24 @@
           symbolCode: "HKD",
           symbol: "HK$",
         },
+        {
+          title: this.$t("yg"),
+          assname: this.$t("印股总资产"),
+          name: "6",
+          bgc: "rgb(255 91 180)",
+          laber: "IN",
+          symbolCode: "IND",
+          symbol: "₹",
+        },
+        {
+          title: this.$t("日股"),
+          assname: this.$t("日股总资产"),
+          name: "7",
+          bgc: "rgb(255 91 100)",
+          laber: "JP",
+          symbolCode: "JPN",
+          symbol: "¥",
+        },
       ],
       getMoneyList: [],
     };
@@ -123,8 +141,10 @@
         });
         let obj = arr.filter((item) => item.name == this.active)[0];
         this.activeObj = obj;
+        console.log(this.activeObj,'obj')
         console.log(obj, "0000000", this.tabsArr);
         this.tabsArr = arr;
+        console.log(this.tabsArr,'arr')
         this.$forceUpdate(); // 强制Vue重新渲染
       }
     },

--
Gitblit v1.9.3