minitest2.0 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minitest2.0",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "private": false,
   "type": "module",
   "repository": {

package/src/api/dashboard.ts

@@ -0,0 +1,44 @@
+import { buildTamRequestPayload, tamRequest } from '@/api/tam'
+
+export type RmbDashboardBody = {
+  /** 城银账户资金余额 */
+  availCredit?: string
+  /** 跨境人民币可用余额 */
+  cipsAvailBal?: string
+  /** 数字人民币可用余额 */
+  dcpTotalAmt?: string
+  /** 人行账户资金余额 */
+  settleAccAmt?: string
+}
+
+export type ForeignDashboardBody = {
+  eurDomesticAmt?: string
+  eurOverseasAmt?: string
+  hkdDomesticAmt?: string
+  hkdOverseasAmt?: string
+  jpyDomesticAmt?: string
+  jpyOverseasAmt?: string
+  usdDomesticAmt?: string
+  usdOverseasAmt?: string
+}
+
+const RMB_DASHBOARD_TRAN_CODE = '/TAM/0001/140000007'
+const FOREIGN_DASHBOARD_TRAN_CODE = '/TAM/0001/140000008'
+
+export function queryRmbDashboard() {
+  return tamRequest<Record<string, never>, RmbDashboardBody>(
+    buildTamRequestPayload({
+      tranCode: RMB_DASHBOARD_TRAN_CODE,
+      body: {},
+    }),
+  )
+}
+
+export function queryForeignDashboard() {
+  return tamRequest<Record<string, never>, ForeignDashboardBody>(
+    buildTamRequestPayload({
+      tranCode: FOREIGN_DASHBOARD_TRAN_CODE,
+      body: {},
+    }),
+  )
+}

package/src/router/index.ts

@@ -26,79 +26,79 @@ const router = createRouter({
     {
       path: '/rmb-position',
       name: 'RmbPosition',
-      component: () => import('@/views/rmb-position/index.vue'),
+      component: () => import('@/views/rmb/position/index.vue'),
       meta: { requiresAuth: true, title: '本币预报信息查询' },
     },
     {
       path: '/rmb-position/new',
       name: 'RmbPositionCreate',
-      component: () => import('@/views/rmb-position-create/index.vue'),
+      component: () => import('@/views/rmb/position/create/index.vue'),
       meta: { requiresAuth: true, title: '新增本币预报' },
     },
     {
       path: '/rmb-position/:predRefNo',
       name: 'RmbPositionDetail',
-      component: () => import('@/views/rmb-position-detail/index.vue'),
+      component: () => import('@/views/rmb/position/detail/index.vue'),
       meta: { requiresAuth: true, title: '预报详情' },
     },
     {
       path: '/foreign-position',
       name: 'ForeignPosition',
-      component: () => import('@/views/foreign-position/index.vue'),
+      component: () => import('@/views/foreign/position/index.vue'),
       meta: { requiresAuth: true, title: '外币预报信息查询' },
     },
     {
       path: '/foreign-position/new',
       name: 'ForeignPositionCreate',
-      component: () => import('@/views/foreign-position-create/index.vue'),
+      component: () => import('@/views/foreign/position/create/index.vue'),
       meta: { requiresAuth: true, title: '新增外币预报' },
     },
     {
       path: '/foreign-position/:predRefNo',
       name: 'ForeignPositionDetail',
-      component: () => import('@/views/foreign-position-detail/index.vue'),
+      component: () => import('@/views/foreign/position/detail/index.vue'),
       meta: { requiresAuth: true, title: '外币预报详情' },
     },
     {
       path: '/pbc-position',
       name: 'PbcPosition',
-      component: () => import('@/views/pbc-position/index.vue'),
+      component: () => import('@/views/rmb/pbc-position/index.vue'),
       meta: { requiresAuth: true, title: '人行头寸余额查询' },
     },
     {
       path: '/position-estimate',
       name: 'PositionEstimate',
-      component: () => import('@/views/position-estimate/index.vue'),
+      component: () => import('@/views/rmb/position-estimate/index.vue'),
       meta: { requiresAuth: true, title: '头寸匡算' },
     },
     {
       path: '/position-estimate/report',
       name: 'PositionEstimateReport',
-      component: () => import('@/views/position-estimate-report/index.vue'),
+      component: () => import('@/views/rmb/position-estimate/report/index.vue'),
       meta: { requiresAuth: true, title: '头寸匡算报表' },
     },
     {
       path: '/position-estimate/opening-reserve',
       name: 'OpeningReserveEstimate',
-      component: () => import('@/views/opening-reserve-estimate/index.vue'),
+      component: () => import('@/views/rmb/position-estimate/opening-reserve/index.vue'),
       meta: { requiresAuth: true, title: '日初备款数匡算' },
     },
     {
       path: '/net-debit',
       name: 'NetDebit',
-      component: () => import('@/views/net-debit/index.vue'),
+      component: () => import('@/views/rmb/net-debit/index.vue'),
       meta: { requiresAuth: true, title: '人民币净借记可用额度管理' },
     },
     {
       path: '/clearing-detail',
       name: 'ClearingDetail',
-      component: () => import('@/views/clearing-detail/index.vue'),
+      component: () => import('@/views/rmb/clearing-detail/index.vue'),
       meta: { requiresAuth: true, title: '人民币小额网银清算场次明细' },
     },
     {
       path: '/warning',
       name: 'Warning',
-      component: () => import('@/views/warning/index.vue'),
+      component: () => import('@/views/rmb/warning/index.vue'),
       meta: { requiresAuth: true, title: '头寸管理平台' },
     },
     {
@@ -110,25 +110,25 @@ const router = createRouter({
     {
       path: '/articles',
       name: 'Articles',
-      component: () => import('@/views/articles/index.vue'),
+      component: () => import('@/views/announcement/index.vue'),
       meta: { requiresAuth: true, showTabbar: true, title: '公告' },
     },
     {
       path: '/articles/new',
       name: 'ArticlePublish',
-      component: () => import('@/views/article-edit/index.vue'),
+      component: () => import('@/views/announcement/edit/index.vue'),
       meta: { requiresAuth: true, title: '发布公告' },
     },
     {
       path: '/articles/:id',
       name: 'ArticleDetail',
-      component: () => import('@/views/article-detail/index.vue'),
+      component: () => import('@/views/announcement/detail/index.vue'),
       meta: { requiresAuth: true, title: '公告详情' },
     },
     {
       path: '/articles/:id/edit',
       name: 'ArticleEdit',
-      component: () => import('@/views/article-edit/index.vue'),
+      component: () => import('@/views/announcement/edit/index.vue'),
       meta: { requiresAuth: true, title: '编辑公告' },
     },
     {
@@ -140,7 +140,7 @@ const router = createRouter({
     {
       path: '/settings',
       name: 'Settings',
-      component: () => import('@/views/settings/index.vue'),
+      component: () => import('@/views/mine/settings/index.vue'),
       meta: { requiresAuth: true, title: '设置' },
     },
   ],

package/src/stores/position-filter.ts

@@ -0,0 +1,38 @@
+import { defineStore } from 'pinia'
+
+/**
+ * 头寸预报查询筛选区状态 Store
+ *
+ * 只保存列表页筛选条件面板的展开/收起状态，避免和应用级配置混在一起。
+ */
+export const usePositionFilterStore = defineStore(
+  'positionFilter',
+  () => {
+    /** 人民币头寸预报及查询列表筛选条件是否展开，默认收起并持久化用户选择。 */
+    const rmbFilterExpanded = ref(false)
+
+    /** 外币头寸预报及查询列表筛选条件是否展开，默认收起并持久化用户选择。 */
+    const foreignFilterExpanded = ref(false)
+
+    function setRmbFilterExpanded(value: boolean) {
+      rmbFilterExpanded.value = value
+    }
+
+    function setForeignFilterExpanded(value: boolean) {
+      foreignFilterExpanded.value = value
+    }
+
+    return {
+      rmbFilterExpanded,
+      foreignFilterExpanded,
+      setRmbFilterExpanded,
+      setForeignFilterExpanded,
+    }
+  },
+  {
+    persist: {
+      key: 'mini2_position_filter_settings',
+      pick: ['rmbFilterExpanded', 'foreignFilterExpanded'],
+    },
+  },
+)

package/src/views/dashboard/index.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { queryForeignDashboard, queryRmbDashboard } from '@/api/dashboard'
+
 defineOptions({ name: 'DashboardPage' })
 
 type DashboardMetric = {
@@ -37,12 +39,30 @@ const selectedUnitFactor = computed(
   () => unitOptions.find((unit) => unit.label === selectedUnit.value)?.factor || 1,
 )
 
-const cards: DashboardCard[] = [
+const dashboardAmounts = reactive({
+  rmb: 0,
+  cityClearing: 0,
+  crossBorderRmb: 0,
+  digitalCurrency: 0,
+  usdDomestic: 0,
+  usdOverseas: 0,
+  eurDomestic: 0,
+  eurOverseas: 0,
+  hkdDomestic: 0,
+  hkdOverseas: 0,
+  jpyDomestic: 0,
+  jpyOverseas: 0,
+})
+
+const isDashboardLoading = ref(false)
+const dashboardLoadError = ref('')
+
+const cards = computed<DashboardCard[]>(() => [
   {
     name: '人民币',
     code: 'CNY',
     symbol: '¥',
-    amount: 8888888.88,
+    amount: dashboardAmounts.rmb,
     image: dashboardImage('01-rmb-great-wall-bg.jpg'),
     accent: '#df2f38',
     position: 'center center',
@@ -51,7 +71,7 @@ const cards: DashboardCard[] = [
     name: '城银清',
     code: 'CNY',
     symbol: '¥',
-    amount: 6888888.88,
+    amount: dashboardAmounts.cityClearing,
     image: dashboardImage('02-city-clearing-skyline-bg.jpg'),
     accent: '#0f4ca7',
     position: 'center center',
@@ -60,7 +80,7 @@ const cards: DashboardCard[] = [
     name: '跨境人民币',
     code: 'CNY',
     symbol: '¥',
-    amount: 1888888.88,
+    amount: dashboardAmounts.crossBorderRmb,
     image: dashboardImage('03-cross-border-rmb-world-map-bg.jpg'),
     accent: '#078b95',
     position: 'center center',
@@ -69,7 +89,7 @@ const cards: DashboardCard[] = [
     name: '数字货币',
     code: 'CNY',
     symbol: '¥',
-    amount: 888888.88,
+    amount: dashboardAmounts.digitalCurrency,
     image: dashboardImage('04-digital-currency-fintech-bg.jpg'),
     accent: '#4423b7',
     position: 'center center',
@@ -78,8 +98,8 @@ const cards: DashboardCard[] = [
     name: '美元',
     code: 'USD',
     metrics: [
-      { label: '境内', symbol: '$', amount: 888888.88 },
-      { label: '境外', symbol: '$', amount: 888888.88 },
+      { label: '境内', symbol: '$', amount: dashboardAmounts.usdDomestic },
+      { label: '境外', symbol: '$', amount: dashboardAmounts.usdOverseas },
     ],
     image: dashboardImage('05-usd-liberty-bg.jpg'),
     accent: '#0d8b3f',
@@ -89,8 +109,8 @@ const cards: DashboardCard[] = [
     name: '欧元',
     code: 'EUR',
     metrics: [
-      { label: '境内', symbol: '€', amount: 888888.88 },
-      { label: '境外', symbol: '€', amount: 888888.88 },
+      { label: '境内', symbol: '€', amount: dashboardAmounts.eurDomestic },
+      { label: '境外', symbol: '€', amount: dashboardAmounts.eurOverseas },
     ],
     image: dashboardImage('06-eur-europe-architecture-bg.jpg'),
     accent: '#1267d5',
@@ -100,8 +120,8 @@ const cards: DashboardCard[] = [
     name: '港元',
     code: 'HKD',
     metrics: [
-      { label: '境内', symbol: 'HK$', amount: 888888.88 },
-      { label: '境外', symbol: 'HK$', amount: 888888.88 },
+      { label: '境内', symbol: 'HK$', amount: dashboardAmounts.hkdDomestic },
+      { label: '境外', symbol: 'HK$', amount: dashboardAmounts.hkdOverseas },
     ],
     image: dashboardImage('07-hkd-hong-kong-skyline-bg.jpg'),
     accent: '#e06b00',
@@ -111,14 +131,18 @@ const cards: DashboardCard[] = [
     name: '日元',
     code: 'JPY',
     metrics: [
-      { label: '境内', symbol: '¥', amount: 888888.88 },
-      { label: '境外', symbol: '¥', amount: 888888.88 },
+      { label: '境内', symbol: '¥', amount: dashboardAmounts.jpyDomestic },
+      { label: '境外', symbol: '¥', amount: dashboardAmounts.jpyOverseas },
     ],
     image: dashboardImage('08-jpy-mount-fuji-bg.jpg'),
     accent: '#6125c8',
     position: 'center center',
   },
-]
+])
+
+onMounted(() => {
+  void loadDashboard()
+})
 
 function getCardStyle(card: DashboardCard) {
   return {
@@ -150,11 +174,93 @@ function formatMoney(amount: number, symbol: string) {
 
   return `${symbol} ${formattedAmount}${unitSuffix}`
 }
+
+async function loadDashboard() {
+  if (isDashboardLoading.value) return
+
+  isDashboardLoading.value = true
+  dashboardLoadError.value = ''
+
+  try {
+    const [rmbResult, foreignResult] = await Promise.allSettled([
+      queryRmbDashboard(),
+      queryForeignDashboard(),
+    ])
+    const errorMessages: string[] = []
+
+    if (rmbResult.status === 'fulfilled') {
+      applyRmbDashboardBody(rmbResult.value.body)
+    } else {
+      errorMessages.push(getErrorMessage(rmbResult.reason))
+    }
+
+    if (foreignResult.status === 'fulfilled') {
+      applyForeignDashboardBody(foreignResult.value.body)
+    } else {
+      errorMessages.push(getErrorMessage(foreignResult.reason))
+    }
+
+    if (errorMessages.length) {
+      dashboardLoadError.value = errorMessages.join('；')
+    }
+  } catch (error) {
+    console.error('[看板] 数据加载失败', error)
+    dashboardLoadError.value = getErrorMessage(error)
+  } finally {
+    isDashboardLoading.value = false
+  }
+}
+
+function applyRmbDashboardBody(body: Awaited<ReturnType<typeof queryRmbDashboard>>['body']) {
+  const result = body || {}
+
+  dashboardAmounts.rmb = toAmount(result.settleAccAmt)
+  dashboardAmounts.cityClearing = toAmount(result.availCredit)
+  dashboardAmounts.crossBorderRmb = toAmount(result.cipsAvailBal)
+  dashboardAmounts.digitalCurrency = toAmount(result.dcpTotalAmt)
+}
+
+function applyForeignDashboardBody(
+  body: Awaited<ReturnType<typeof queryForeignDashboard>>['body'],
+) {
+  const result = body || {}
+
+  dashboardAmounts.usdDomestic = toAmount(result.usdDomesticAmt)
+  dashboardAmounts.usdOverseas = toAmount(result.usdOverseasAmt)
+  dashboardAmounts.eurDomestic = toAmount(result.eurDomesticAmt)
+  dashboardAmounts.eurOverseas = toAmount(result.eurOverseasAmt)
+  dashboardAmounts.hkdDomestic = toAmount(result.hkdDomesticAmt)
+  dashboardAmounts.hkdOverseas = toAmount(result.hkdOverseasAmt)
+  dashboardAmounts.jpyDomestic = toAmount(result.jpyDomesticAmt)
+  dashboardAmounts.jpyOverseas = toAmount(result.jpyOverseasAmt)
+}
+
+function toAmount(value: unknown) {
+  const amount = Number(String(value ?? '').replaceAll(',', '').trim())
+
+  return Number.isFinite(amount) ? amount : 0
+}
+
+function getErrorMessage(error: unknown) {
+  if (error instanceof Error && error.message) return error.message
+
+  return '看板数据加载失败'
+}
 </script>
 
 <template>
-  <main class="dashboard-page">
+  <main class="dashboard-page" :aria-busy="isDashboardLoading">
     <div class="dashboard-toolbar" aria-label="看板设置">
+      <button
+        v-if="dashboardLoadError"
+        class="dashboard-retry"
+        type="button"
+        :disabled="isDashboardLoading"
+        @click="loadDashboard"
+      >
+        刷新
+      </button>
+
       <label class="unit-switch">
         <span class="unit-switch__label">单位</span>
         <select v-model="selectedUnit" class="unit-switch__select" aria-label="切换金额单位">
@@ -180,8 +286,8 @@ function formatMoney(amount: number, symbol: string) {
           <span class="dashboard-card__code">{{ card.code }}</span>
         </header>
 
-        <p v-if="card.amount" class="dashboard-card__amount">
-          {{ formatMoney(card.amount, card.symbol || '') }}
+        <p v-if="!card.metrics" class="dashboard-card__amount">
+          {{ formatMoney(card.amount || 0, card.symbol || '') }}
         </p>
 
         <div v-else class="dashboard-card__metrics">
@@ -211,10 +317,29 @@ function formatMoney(amount: number, symbol: string) {
 
 .dashboard-toolbar {
   display: flex;
+  align-items: center;
   justify-content: flex-end;
   margin-bottom: 6px;
 }
 
+.dashboard-retry {
+  height: 24px;
+  margin-right: auto;
+  border: 1px solid #ffd4d8;
+  border-radius: 5px;
+  padding: 0 10px;
+  color: #dc2735;
+  font: inherit;
+  font-size: 12px;
+  font-weight: 700;
+  line-height: 22px;
+  background: #fff5f6;
+}
+
+.dashboard-retry:disabled {
+  opacity: 0.62;
+}
+
 .unit-switch {
   position: relative;
   display: inline-flex;

package/src/views/{foreign-position → foreign/position}/index.vue

@@ -6,6 +6,7 @@ import {
   type ForeignForecastRecord,
 } from '@/api/foreign-position'
 import { useAppStore } from '@/stores/app'
+import { usePositionFilterStore } from '@/stores/position-filter'
 import {
   allForeignBusinessOption,
   allForeignStatusOption,
@@ -54,6 +55,7 @@ type SelectorOption = ForeignOption | ForeignStatusOption
 
 const router = useRouter()
 const appStore = useAppStore()
+const positionFilterStore = usePositionFilterStore()
 const defaultTranDate = appStore.systemWorkDate
 const heroImage = `${import.meta.env.BASE_URL}images/12a73787-86a9-4891-a65f-66104746f6a8.png`
 const pageSize = 10
@@ -74,7 +76,8 @@ const showDatePicker = ref(false)
 const datePickerValue = ref(selectedDate.value.split('-'))
 const minDate = new Date(2020, 0, 1)
 const maxDate = new Date(2030, 11, 31)
-const isFilterExpanded = ref(true)
+// 筛选区展开状态由 Pinia 持久化；首次进入无缓存时默认收起。
+const isFilterExpanded = computed(() => positionFilterStore.foreignFilterExpanded)
 
 const forecastList = ref<Forecast[]>([])
 const forecastTotal = ref(0)
@@ -183,6 +186,10 @@ function scrollToTop() {
   })
 }
 
+function toggleFilterExpanded() {
+  positionFilterStore.setForeignFilterExpanded(!isFilterExpanded.value)
+}
+
 function openCreatePage() {
   router.push({
     name: 'ForeignPositionCreate',
@@ -417,7 +424,7 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
             class="filter-toggle"
             type="button"
             :aria-expanded="isFilterExpanded"
-            @click="isFilterExpanded = !isFilterExpanded"
+            @click="toggleFilterExpanded"
           >
             <van-icon :name="isFilterExpanded ? 'arrow-up' : 'arrow-down'" />
             <span>{{ isFilterExpanded ? '收起' : '展开' }}</span>

package/src/views/{rmb-position → rmb/position}/index.vue

@@ -6,6 +6,7 @@ import {
   type RmbForecastRecord,
 } from '@/api/rmb-position'
 import { useAppStore } from '@/stores/app'
+import { usePositionFilterStore } from '@/stores/position-filter'
 import {
   forecastStatusMap,
   formatForecastAmount,
@@ -41,6 +42,7 @@ type PendingForecast = {
 
 const router = useRouter()
 const appStore = useAppStore()
+const positionFilterStore = usePositionFilterStore()
 const defaultTranDate = appStore.systemWorkDate
 const heroImage = `${import.meta.env.BASE_URL}images/5798d7aa-ba8b-4605-8079-58b35495ac55.png`
 const pageSize = 10
@@ -58,7 +60,8 @@ const showDatePicker = ref(false)
 const datePickerValue = ref(selectedDate.value.split('-'))
 const minDate = new Date(2020, 0, 1)
 const maxDate = new Date(2030, 11, 31)
-const isFilterExpanded = ref(true)
+// 筛选区展开状态由 Pinia 持久化；首次进入无缓存时默认收起。
+const isFilterExpanded = computed(() => positionFilterStore.rmbFilterExpanded)
 
 const forecastList = ref<Forecast[]>([])
 const forecastTotal = ref(0)
@@ -135,6 +138,10 @@ function scrollToTop() {
   })
 }
 
+function toggleFilterExpanded() {
+  positionFilterStore.setRmbFilterExpanded(!isFilterExpanded.value)
+}
+
 function openCreatePage() {
   router.push({
     name: 'RmbPositionCreate',
@@ -311,7 +318,7 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
             class="filter-toggle"
             type="button"
             :aria-expanded="isFilterExpanded"
-            @click="isFilterExpanded = !isFilterExpanded"
+            @click="toggleFilterExpanded"
           >
             <van-icon :name="isFilterExpanded ? 'arrow-up' : 'arrow-down'" />
             <span>{{ isFilterExpanded ? '收起' : '展开' }}</span>