Handy_Cao 1 rok pred
rodič
commit
c2dae5a911

+ 10 - 1
public/locales/en-US.json

@@ -1308,15 +1308,23 @@
         "accountinfo": "AccountInformation",
         "reckondate": "ReckonDate",
         "reportdetail": "ReportDetail",
+        "balance": "Balance",
+        "currentbalance": "CurrentBalance",
+        "avaiablemoney": "AvaiableFunds",
         "day": "DayReport",
         "month": "MonthReport",
         "trade": {
+            "goodsdisplay": "Name/Code",
+            "buyorselldisplay": "BuyOrSell",
             "tradeqty": "TradeQty",
             "tradeprice": "TradePrice",
             "tradeamount": "TradeAmount",
-            "charge": "Charge"
+            "charge": "Charge",
+            "tradetime": "TradeTime"
         },
         "position": {
+            "goodsdisplay": "Name/Code",
+            "buyorselldisplay": "BuyOrSell",
             "curpositionqty": "CurPositionQty",
             "frozenqty": "FrozenQty",
             "curholderamount": "CurHolderAmount",
@@ -1331,6 +1339,7 @@
     },
     "notices": {
         "title": "Notice Announcement",
+        "title1": "System Notices",
         "notice": "Notice", 
         "announcement": "Announcement",
         "details": "Details"

+ 10 - 1
public/locales/zh-CN.json

@@ -1313,15 +1313,23 @@
         "accountinfo": "账户信息",
         "reckondate": "结算日期",
         "reportdetail": "报表明细",
+        "balance": "期初余额",
+        "currentbalance": "期末余额",
+        "avaiablemoney": "可用资金",
         "day": "日报表",
         "month": "月报表",
         "trade": {
+            "goodsdisplay": "商品",
+            "buyorselldisplay": "方向",
             "tradeqty": "数量",
             "tradeprice": "价格",
             "tradeamount": "成交金额",
-            "charge": "服务费"
+            "charge": "服务费",
+            "tradetime": "时间"
         },
         "position": {
+            "goodsdisplay": "商品",
+            "buyorselldisplay": "方向",
             "curpositionqty": "持有量",
             "frozenqty": "冻结量",
             "curholderamount": "订单金额",
@@ -1336,6 +1344,7 @@
     },
     "notices": {
         "title": "通知公告",
+        "title1": "系统公告",
         "notice": "通知", 
         "announcement": "公告", 
         "details": "公告详情"

+ 6 - 4
src/packages/pc/components/layouts/header/components/notice/index.vue

@@ -1,11 +1,11 @@
 <!-- 系统公告 -->
 <template>
-    <app-drawer class="app-notice" title="系统公告" :width="800" v-model:show="show">
+    <app-drawer class="app-notice" :title="t('notices.title1')" :width="800" v-model:show="show">
         <app-view>
             <template #header>
                 <el-tabs class="app-notice-tabs" v-model="selectedTab" @tab-change="tabChange">
-                    <el-tab-pane label="公告" name="notice" />
-                    <el-tab-pane label="消息" name="message" />
+                    <el-tab-pane :label="t('notices.notice')" name="notice" />
+                    <el-tab-pane :label="t('notices.announcement')" name="message" />
                 </el-tabs>
             </template>
             <div class="app-notice-pane" v-if="tableList.length">
@@ -41,7 +41,7 @@
 import { shallowRef, onMounted, computed } from 'vue'
 import { formatDate, formatHtmlString } from '@/filters'
 import { useLocalPagination } from '@/hooks/pagination'
-import { useNoticeStore } from '@/stores'
+import { useNoticeStore, i18n } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const noticeStore = useNoticeStore()
@@ -50,6 +50,8 @@ const selectedTab = shallowRef('notice')
 const active = shallowRef(-1)
 const dataList = shallowRef<Model.NoticeRsp[]>([])
 
+const { t } = i18n.global
+
 const { tableList, initTableData, loadMore } = useLocalPagination<Model.NoticeRsp>()
 
 const selectedItem = computed(() => dataList.value[active.value])

+ 40 - 40
src/packages/pc/components/layouts/header/components/report/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商结算单 -->
 <template>
-    <app-drawer title="交易商结算单" :width="1000" v-model:show="show" :show-close="!!reportAgree[agreeIndex]?.isAgree">
+    <app-drawer :title="t('report.title')" :width="1000" v-model:show="show" :show-close="!!reportAgree[agreeIndex]?.isAgree">
         <div class="el-form--horizontal">
             <div class="el-form-item--col">
                 <el-select effect="dark" :placeholder="t('common.choice')" v-model="reporttype" @change="onChange" style="width: 160px;">
@@ -12,7 +12,7 @@
                 <el-button type="primary" :loading="loading" @click="requestData">{{ t('operation.search') }}</el-button>
             </div>
         </div>
-        <app-table-details title="账户信息" :data="currentAccount" :label-width="180" :cell-props="accountDetailProps"
+        <app-table-details :title="t('report.accountinfo')" :data="currentAccount" :label-width="180" :cell-props="accountDetailProps"
             :column="2">
             <!-- 名称 -->
             <template #accountname>
@@ -27,17 +27,17 @@
                 {{ tradeDate }}
             </template>
         </app-table-details>
-        <app-table-details title="资金信息" :data="taaccount" :label-width="180" :cell-props="taDetailProps" :column="2" />
+        <app-table-details :title="t('report.fundsinfo')" :data="taaccount" :label-width="180" :cell-props="taDetailProps" :column="2" />
         <fieldset class="g-fieldset">
-            <legend class="g-fieldset__legend">出入金明细</legend>
+            <legend class="g-fieldset__legend">{{ t('report.inoutamountdetail') }}</legend>
             <app-table :data="logs" v-model:columns="logsTableColumns" />
         </fieldset>
         <fieldset class="g-fieldset">
-            <legend class="g-fieldset__legend">持仓汇总</legend>
+            <legend class="g-fieldset__legend">{{ t('report.ordersumary') }}</legend>
             <app-table :data="dpostions" v-model:columns="dpostionsTableColumns" />
         </fieldset>
         <fieldset class="g-fieldset">
-            <legend class="g-fieldset__legend">成交明细</legend>
+            <legend class="g-fieldset__legend">{{ t('report.tradedetail') }}</legend>
             <app-table :data="tradedetails" v-model:columns="tradeDetailsTableColumns" />
         </fieldset>
         <template #footer>
@@ -191,59 +191,59 @@ const requestData = () => {
 
 /// 账户信息
 const accountDetailProps = [
-    { prop: 'currencyid', label: '币种:' },
-    { prop: 'accountid', label: '账号:' },
-    { prop: 'accountname', label: '名称:' },
-    { prop: 'tradedate', label: '结算日期:' },
+    { prop: 'currencyid', label: t('report.currency') },
+    { prop: 'accountid', label: t('report.accountid') },
+    { prop: 'accountname', label: t('report.customername') },
+    { prop: 'tradedate', label: t('report.tradedate') },
 ]
 
 /// 资金信息
 const taDetailProps = [
-    { prop: 'balance', label: '期初余额:', decimal: 2, entireRow: true },
-    { prop: 'inamount', label: '银行入金:', decimal: 2 },
-    { prop: 'closepl', label: '平仓损益:', decimal: 2 },
-    { prop: 'outamount', label: '银行出金:', decimal: 2 },
-    { prop: 'reckonpl', label: '结算损益:', decimal: 2 },
-    { prop: 'paycharge', label: '服务费:', decimal: 2 },
-    { prop: 'currentbalance', label: '期末余额:', decimal: 2, entireRow: true },
-    { prop: 'oriusedmargin', label: '占用资金:', decimal: 2 },
-    { prop: 'orioutamountfreeze', label: '冻结资金:', decimal: 2 },
-    { prop: 'avaiablemoney', label: '可用资金:', decimal: 2 },
-    { prop: 'avaiableoutmoney', label: '可出资金:', decimal: 2 },
+    { prop: 'balance', label: t('report.balance'), decimal: 2, entireRow: true },
+    { prop: 'inamount', label: t('report.inamount'), decimal: 2 },
+    { prop: 'closepl', label: t('report.closepl'), decimal: 2 },
+    { prop: 'outamount', label: t('report.outamount'), decimal: 2 },
+    { prop: 'reckonpl', label: t('report.reckonpl'), decimal: 2 },
+    { prop: 'paycharge', label: t('report.paycharge'), decimal: 2 },
+    { prop: 'currentbalance', label: t('report.currentbalance'), decimal: 2, entireRow: true },
+    { prop: 'oriusedmargin', label: t('report.oriusedmargin'), decimal: 2 },
+    { prop: 'orioutamountfreeze', label: t('report.orioutamountfreeze'), decimal: 2 },
+    { prop: 'avaiablemoney', label: t('report.avaiablemoney'), decimal: 2 },
+    { prop: 'avaiableoutmoney', label: t('report.avaiableoutmoney'), decimal: 2 },
 ]
 
 /// 出入金明细
 const logsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'updatetime', label: '时间' },
-    { field: 'executetypedisplay', label: '资金类型' },
-    { field: 'amount', label: '金额' },
-    { field: 'applystatusdisplay', label: '状态' },
+    { field: 'updatetime', label: t('report.bank.updatetime') },
+    { field: 'executetypedisplay', label: t('report.bank.executetypedisplay') },
+    { field: 'amount', label: t('report.bank.amount') },
+    { field: 'applystatusdisplay', label: t('report.bank.applystatusdisplay') },
 ])
 
 /// 持仓汇总
 const dpostionsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: '商品' },
-    { field: 'buyorselldisplay', label: '方向' },
-    { field: 'curpositionqty', label: '持有量' },
-    { field: 'frozenqty', label: '冻结量' },
-    { field: 'curholderamount', label: '持仓金额' },
-    { field: 'avagepricedisplay', label: '均价' },
+    { field: 'goodsdisplay', label: t('report.position.goodsdisplay') },
+    { field: 'buyorselldisplay', label: t('report.position.buyorselldisplay') },
+    { field: 'curpositionqty', label: t('report.position.curpositionqty') },
+    { field: 'frozenqty', label: t('report.position.frozenqty') },
+    { field: 'curholderamount', label: t('report.position.curholderamount') },
+    { field: 'avagepricedisplay', label: t('report.position.avagepricedisplay') },
 ])
 
 /// 成交明细
 const tradeDetailsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: '商品' },
-    { field: 'buyorselldisplay', label: '类型/方向', width: 100 },
-    { field: 'tradeqty', label: '数量', width: 80 },
-    { field: 'tradeprice', label: '价格', width: 80 },
-    { field: 'tradeamount', label: '成交金额', width: 100 },
-    { field: 'charge', label: '服务费', width: 80 },
-    { field: 'tradetime', label: '时间' },
+    { field: 'goodsdisplay', label: t('report.trade.goodsdisplay') },
+    { field: 'buyorselldisplay', label: t('report.trade.buyorselldisplay'), width: 100 },
+    { field: 'tradeqty', label: t('report.trade.tradeqty'), width: 80 },
+    { field: 'tradeprice', label: t('report.trade.tradeprice'), width: 80 },
+    { field: 'tradeamount', label: t('report.trade.tradeamount'), width: 100 },
+    { field: 'charge', label: t('report.trade.charge'), width: 80 },
+    { field: 'tradetime', label: t('report.trade.tradetime') },
 ])
 
 const selectList = [
-    { label: '日报表', value: 1 },
-    { label: '月报表', value: 2 },
+    { label: t('report.day'), value: 1 },
+    { label: t('report.month'), value: 2 },
 ]
 
 /// 请求数据

+ 8 - 8
src/packages/pc/components/modules/quote/forex/index.vue

@@ -58,10 +58,10 @@ const buyList = computed(() => {
         if (item) {
             const result = [
                 {
-                    label: '价',
-                    price: item.ask,
-                    qty: item.askvolume,
-                    color: item.askColor,
+                    label: '价',
+                    price: item.bid,
+                    qty: item.bidvolume,
+                    color: item.bidColor,
                 }
             ]
             return result.slice(0, item.quotegear || 1)
@@ -113,10 +113,10 @@ const sellList = computed(() => {
         if (item) {
             const result = [
                 {
-                    label: '价',
-                    price: item.bid,
-                    qty: item.bidvolume,
-                    color: item.bidColor,
+                    label: '价',
+                    price: item.ask,
+                    qty: item.askvolume,
+                    color: item.askColor,
                 }
             ]
             return result.slice(0, item.quotegear || 1)