123

ruoyi-screen/src/api/login.js

@@ -19,3 +19,11 @@ export function getCodeImg() {
     timeout: 20000
   })
 }
+
+/** 退出登录（对齐 ruoyi-ui） */
+export function logout() {
+  return request({
+    url: '/logout',
+    method: 'post'
+  })
+}

ruoyi-screen/src/components/ScreenNavBar.vue

@@ -44,6 +44,8 @@
 <script setup>
 import { computed } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import { logout } from "@/api/login";
+import { removeToken } from "@/utils/auth";
 
 const router = useRouter();
 const route = useRoute();
@@ -97,20 +99,9 @@ function goNav(item) {
 }
 
 function onLogout() {
-  console.log(111)
-}
-
-function onNavClick(item) {
-  if (item.action === "logout") onLogout();
-  else goNav(item);
-}
-
-function toggleFullscreen() {
-  if (!document.fullscreenElement) {
-    document.documentElement.requestFullscreen?.();
-  } else {
-    document.exitFullscreen?.();
-  }
+  logout().catch(() => {});
+  removeToken();
+  router.replace({ path: "/login" });
 }
 </script>
 

ruoyi-screen/src/views/tradeSales/chartOptions.js

@@ -132,13 +132,13 @@ export function buildTradeMonthlyOption(tradeMonthlyTrend) {
     color: ['#5ef0c8', '#ecd27b'],
     tooltip: { trigger: 'axis' },
     legend: {
-      bottom: 0,
+      top: 0,
       left: 'center',
       textStyle: { color: '#a8d4c8', fontSize: 10 },
       itemWidth: 14,
       itemHeight: 8
     },
-    grid: { ...GRID, bottom: 36 },
+    grid: { ...GRID, bottom: 10 },
     xAxis: {
       type: 'category',
       data: MONTHS,
@@ -210,7 +210,7 @@ export function buildSalesDestinationBarOption(salesDestination) {
         return `${p.name}<br/>${p.value} 头 (${ratio})`
       }
     },
-    grid: { ...GRID, top: 12, bottom: 28 },
+    grid: { ...GRID, top: 12, bottom: 10 },
     xAxis: {
       type: 'category',
       data: names,
@@ -361,7 +361,7 @@ export function buildMallOrderTrendOption(mallOrderTrend, mallStatsAvailable = t
   return {
     color: ['#6eb5ff'],
     tooltip: { trigger: 'axis' },
-    grid: { ...GRID, top: 12, bottom: 32 },
+    grid: { ...GRID, top: 12, bottom: 10 },
     xAxis: {
       type: 'category',
       data: MONTHS,
@@ -424,7 +424,11 @@ export function buildShopEntryPieOption(shopEntry, mallStatsAvailable = true) {
         label: {
           color: '#e8eef5',
           fontSize: 9,
-          formatter: (p) => `${p.name}\n${p.percent}%`
+          formatter: (p) => {
+            const row = shopEntry.items.find((it) => `${it.month}月` === p.name)
+            const ratio = row?.ratio != null ? Number(row.ratio).toFixed(1) : p.percent
+            return `${p.name}\n${ratio}%`
+          }
         },
         labelLine: { length: 6, length2: 4 },
         data
@@ -457,7 +461,7 @@ export function buildRegionRankBarOption(regionRank, mallStatsAvailable = true)
         return `${p.name}<br/>${Number(p.value).toFixed(2)} 万元`
       }
     },
-    grid: { ...GRID, top: 12, bottom: 28 },
+    grid: { ...GRID, top: 12, bottom: 10 },
     xAxis: {
       type: 'category',
       data: names,

ruoyi-screen/src/views/tradeSales/index.vue

@@ -110,7 +110,7 @@
       <div class="screen-page--home-column-right ts-mall-panel">
         <div class="top_title">
           农资品类销售 ཞིང་ལས་རྒྱུ་ཆ་རིགས་ཀྱི་ཚོང་འདོན།
-          <span v-if="categoryStatDate" class="ts-mall-stat-date">（{{ categoryStatDate }}）</span>
+          <!-- <span v-if="categoryStatYearLabel" class="ts-mall-stat-year">（{{ categoryStatYearLabel }}）</span> -->
         </div>
         <div class="ts-mall-top">
           <div class="ts-mall-top__pie">
@@ -227,9 +227,17 @@ const hotCategoryItems = computed(() => {
 
 const mallEmptyHint = computed(() => (mallStatsAvailable.value ? '暂无热销数据' : '商城统计未接入'))
 
-const categoryStatDate = computed(
-  () => categorySales.value?.statDate || hotCategoryRank.value?.statDate || ''
-)
+/** 右栏品类/热销标题：展示统计年 Y（对齐 v1.2 categorySales.statYear） */
+const categoryStatYearLabel = computed(() => {
+  const y =
+    categorySales.value?.statYear ??
+    hotCategoryRank.value?.statYear ??
+    statYear.value
+  if (y === null || y === undefined || y === '') {
+    return ''
+  }
+  return `${y}年`
+})
 
 const tradeOverviewItems = computed(() => {
   const o = tradeOverview.value
@@ -531,7 +539,7 @@ onUnmounted(() => {
   flex-direction: column;
 }
 
-.ts-mall-stat-date {
+.ts-mall-stat-year {
   font-size: 12px;
   color: rgba(168, 212, 200, 0.8);
   margin-left: 4px;