xxxx

public/locales/en-US.json

@@ -3612,6 +3612,8 @@
         "marketrun_monitor_marketer": "Market Maker Risk Monitoring",
         "marketrun_monitor_marketer_positionsumm": "Position Summary",
         "marketrun_monitor_positionsumm": "Position Summary Monitoring",
+        "marketrun_monitor_positionbuy": "持仓买监控",
+        "marketrun_monitor_positionsell": "持仓卖监控",
         "marketrun_monitor_user": "Online User Query",
         "marketrun_monitor_user_alloffline": "Force All Users Offline",
         "marketrun_monitor_user_offline": "Offline",
@@ -4033,7 +4035,8 @@
         "notice_news_delete": "Delete",
         "NotFound": "System Error",
         "NotFoundIndex": "404",
-        "router_menu": "路由管理"
+        "router_menu": "路由管理",
+        "router": "路由"
     },
     "enum": {
         "adminstatus": {

public/locales/th-TH.json

@@ -3612,6 +3612,8 @@
         "marketrun_monitor_marketer": "การตรวจสอบความเสี่ยงของผู้ดูแลสภาพคล่อง",
         "marketrun_monitor_marketer_positionsumm": "สรุปสถานะการถือครอง",
         "marketrun_monitor_positionsumm": "การตรวจสอบสรุปสถานะการถือครอง",
+        "marketrun_monitor_positionbuy": "持仓买监控",
+        "marketrun_monitor_positionsell": "持仓卖监控",
         "marketrun_monitor_user": "การสืบค้นผู้ใช้ออนไลน์",
         "marketrun_monitor_user_alloffline": "บังคับผู้ใช้ทั้งหมดออฟไลน์",
         "marketrun_monitor_user_offline": "ออฟไลน์",
@@ -4033,7 +4035,8 @@
         "notice_news_delete": "ลบ",
         "NotFound": "ข้อผิดพลาดของระบบ",
         "NotFoundIndex": "404",
-        "router_menu": "路由管理"
+        "router_menu": "路由管理",
+        "router": "路由"
     },
     "enum": {
         "adminstatus": {

public/locales/vi-VN.json

@@ -3612,6 +3612,8 @@
         "marketrun_monitor_marketer": "Giám sát rủi ro thành viên tạo lập thị trường",
         "marketrun_monitor_marketer_positionsumm": "Tổng hợp vị thế",
         "marketrun_monitor_positionsumm": "Giám sát tổng vị thế",
+        "marketrun_monitor_positionbuy": "持仓买监控",
+        "marketrun_monitor_positionsell": "持仓卖监控",
         "marketrun_monitor_user": "Truy vấn người dùng trực tuyến",
         "marketrun_monitor_user_alloffline": "Buộc tất cả người dùng ngắt kết nối",
         "marketrun_monitor_user_offline": "Ngắt kết nối",
@@ -4033,7 +4035,8 @@
         "notice_news_delete": "Xóa",
         "NotFound": "Lỗi hệ thống",
         "NotFoundIndex": "404",
-        "router_menu": "路由管理"
+        "router_menu": "路由管理",
+        "router": "路由"
     },
     "enum": {
         "adminstatus": {

public/locales/zh-CN.json

@@ -3612,6 +3612,8 @@
         "marketrun_monitor_marketer": "做市会员风险监控",
         "marketrun_monitor_marketer_positionsumm": "持仓汇总",
         "marketrun_monitor_positionsumm": "持仓汇总监控",
+        "marketrun_monitor_positionbuy": "持仓买监控",
+        "marketrun_monitor_positionsell": "持仓卖监控",
         "marketrun_monitor_user": "在线用户查询",
         "marketrun_monitor_user_alloffline": "强制所有用户下线",
         "marketrun_monitor_user_offline": "下线",
@@ -4033,7 +4035,8 @@
         "notice_news_delete": "删除",
         "NotFound": "系统错误",
         "NotFoundIndex": "404",
-        "router_menu": "路由管理"
+        "router_menu": "路由管理",
+        "router": "路由"
     },
     "enum": {
         "adminstatus": {

public/locales/zh-TW.json

@@ -3612,6 +3612,8 @@
         "marketrun_monitor_marketer": "做市會員風險監控",
         "marketrun_monitor_marketer_positionsumm": "持倉彙總",
         "marketrun_monitor_positionsumm": "持倉彙總監控",
+        "marketrun_monitor_positionbuy": "持仓买监控",
+        "marketrun_monitor_positionsell": "持仓卖监控",
         "marketrun_monitor_user": "在線用戶查詢",
         "marketrun_monitor_user_alloffline": "強制所有用戶下線",
         "marketrun_monitor_user_offline": "下線",
@@ -4033,7 +4035,8 @@
         "notice_news_delete": "刪除",
         "NotFound": "系統錯誤",
         "NotFoundIndex": "404",
-        "router_menu": "路由管理"
+        "router_menu": "路由管理",
+        "router": "路由"
     },
     "enum": {
         "adminstatus": {

src/packages/pc/views/base/sysparams/index.vue

@@ -42,10 +42,10 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'paramcode', label: '参数代码' },
-    { field: 'paramname', label: '参数名' },
-    { field: 'paramvalue', label: '参数值' },
-    { field: 'remark', label: '说明', },
+    { field: 'paramcode', label: 'base.sys_params.paramcode' },
+    { field: 'paramname', label: 'base.sys_params.paramname' },
+    { field: 'paramvalue', label: 'base.sys_params.paramvalue' },
+    { field: 'remark', label: 'base.sys_params.remark', },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 

src/packages/pc/views/member/institution/marketer/components/details/index.vue

@@ -1,8 +1,8 @@
 <!-- 会员机构管理-机构管理-做市会员管理-详情 -->
 <template>
     <app-drawer title="详情" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
-        <app-table-details :title="t('member.institution.marketer.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <app-table-details :title="t('member.institution.marketer.details.subtitle3')" :data="data?.roleNight[0]" :label-width="160" :cell-props="detailProps2" :column="1" />
+        <app-table-details v-if="data" :title="t('member.institution.marketer.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
+        <app-table-details v-if="data" :title="t('member.institution.marketer.details.subtitle3')" :data="data?.roleNight[0]" :label-width="160" :cell-props="detailProps2" :column="1" />
         <app-table-details v-if="marker" :title="t('member.institution.marketer.details.subtitle4')" :data="marker" :label-width="160" :cell-props="detailProps3" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
@@ -49,29 +49,35 @@ const { data } = useRequest(queryRoleDetail, {
         ElMessage.error(err)
     },
     onSuccess: (res) => {
-        getRiskRatioTypeForMarketer({
-            data: {
-                riskcontrolmode: 2,
-                customertype: res.data.customertype.customertype
-            }
-        }).then((data) => {
-            marker.value = data.data
-        })
+        if (res.data.customertype) {
+            const { customertype } = res.data.customertype
+            getRiskRatioTypeForMarketer({
+                data: {
+                    riskcontrolmode: 2,
+                    customertype: customertype
+                }
+            }).then((data) => {
+                marker.value = data.data
+            })
+        }
     }
 })
 
-const detailProps1: CellProp[] = [
-    { prop: 'accountname', label: 'member.institution.marketer.details.accountname' },
-    { prop: 'userName', label: 'member.institution.marketer.details.userName', formatValue: () => {
-        return data.value?.users.username
-    } },
-    { prop: 'customertype', label: 'member.institution.marketer.details.customertype', formatValue: () => customerTypeEnum.getEnumTypeName(data.value?.customertype.customertype) }
-]
+const detailProps1 = computed<CellProp[]>(() => {
+    const { customertype } = data.value?.customertype ?? {}
+    return [
+        { prop: 'accountname', label: 'member.institution.marketer.details.accountname' },
+        { prop: 'userName', label: 'member.institution.marketer.details.userName', formatValue: () => {
+            return data.value?.users.username
+        } },
+        { prop: 'customertype', label: 'member.institution.marketer.details.customertype', formatValue: () => customerTypeEnum.getEnumTypeName(customertype), show: !!customertype }
+    ]
+})
 
 const detailProps2: CellProp[] = [
     { prop: 'enumdicname', label: 'member.institution.marketer.details.enumdicname'},
     { prop: 'reckonaccountid', label: 'member.institution.marketer.details.reckonaccountid1' }
-]
+] 
 
 const detailProps3 = computed<CellProp[]>(() => {
     const { notesaferatio } = marker.value ?? {}

src/packages/pc/views/system/menu/index.vue

@@ -41,10 +41,10 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 const { dataList, run } = useRequest(getAllMenus)
 
 const columns = shallowRef([
-    { field: 'title', label: '菜单', align: 'left' },
-    { field: 'resourceCode', label: '代码', },
-    { field: 'url', label: '路由', },
-    { field: 'icon', label: '图标', },
+    { field: 'title', label: 'system.menu.title', align: 'left' },
+    { field: 'resourceCode', label: 'system.menu.resourceCode', },
+    { field: 'url', label: 'system.menu.url', },
+    { field: 'icon', label: 'system.menu.icon', },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])