优化接口响应时间，提升系统性能

shaofan
1 parent 6a1f8b67
Showing 5 changed files with 95 additions and 7 deletions
src/components/AppMenuTree.vue
src/config/menu.ts
src/views/message/MessageList.vue
src/views/system/MenuManage.vue
src/views/system/RoleMenuAssign.vue
@@ -25,6 +25,7 @@ import {
   ControlOutlined,
   GlobalOutlined,
   HomeOutlined,
+  MessageOutlined,
   SettingOutlined,
   ShopOutlined,
   StarOutlined,
@@ -51,6 +52,7 @@ const iconMap: Record&lt;string, Component&gt; = {
   TeamOutlined,
   TrophyOutlined,
   SettingOutlined,
+  MessageOutlined,
 }
 const codeIconMap: Record<string, Component> = {
@@ -19,6 +19,7 @@ export const iconRegistry: Record&lt;string, string&gt; = {
   TeamOutlined: 'team',
   TrophyOutlined: 'trophy',
   SettingOutlined: 'setting',
+  MessageOutlined: 'message',
 }
 export const pinnedQuickLinks: QuickLinkItem[] = [
@@ -3,6 +3,18 @@
     <a-card title="消息管理" :bordered="false">
       <div class="list-toolbar">
         <div class="list-toolbar-left">
+          <a-select
+            v-if="isAdmin"
+            v-model:value="selectedCityId"
+            placeholder="请选择租户"
+            style="width: 180px"
+            @change="handleCityChange"
+          >
+            <a-select-option v-for="item in cityList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
+          <div v-else class="managed-city-pill">当前租户：{{ currentCityName }}</div>
           <a-input
             v-model:value="searchForm.riderId"
             placeholder="骑手ID"
@@ -18,14 +30,22 @@
             <a-select-option :value="1">订单消息</a-select-option>
             <a-select-option :value="2">系统通知</a-select-option>
           </a-select>
-          <a-button type="primary" @click="loadList">查询</a-button>
+          <a-button type="primary" :disabled="!canQuery" @click="handleSearch">查询</a-button>
         </div>
         <div class="list-toolbar-right">
-          <a-button type="primary" @click="openSend">发送消息</a-button>
-          <a-button @click="openBroadcast">群发消息</a-button>
+          <a-button type="primary" :disabled="!canQuery" @click="openSend">发送消息</a-button>
+          <a-button :disabled="!canQuery" @click="openBroadcast">群发消息</a-button>
         </div>
       </div>
+      <a-alert
+        v-if="isAdmin"
+        type="info"
+        show-icon
+        message="平台管理员需要先选择租户，消息列表、单发和群发都会限定在所选租户内。"
+        style="margin-bottom: 16px"
+      />
+
       <a-table
         :dataSource="list"
         :columns="columns"
@@ -59,6 +79,12 @@
       @ok="handleSend"
       :confirmLoading="sending"
     >
+      <a-alert
+        :message="`将发送给当前租户（${currentCityName}）下的指定骑手`"
+        type="info"
+        show-icon
+        style="margin-bottom: 16px"
+      />
       <a-form :model="sendForm" layout="vertical">
         <a-form-item label="骑手ID" required>
           <a-input-number v-model:value="sendForm.riderId" style="width: 100%" placeholder="请输入骑手ID" />
@@ -86,7 +112,7 @@
       :confirmLoading="broadcasting"
     >
       <a-alert
-        message="将发送给当前城市所有正常状态的骑手"
+        :message="`将发送给当前租户（${currentCityName}）所有正常状态的骑手`"
         type="warning"
         show-icon
         style="margin-bottom: 16px"
@@ -113,14 +139,18 @@
 import { onMounted, reactive, ref, computed } from 'vue'
 import { message } from 'ant-design-vue'
 import { messageApi } from '@/api'
+import { useRoleCityList } from '@/composables/useRoleCityList'
 import type { TablePaginationConfig } from 'ant-design-vue'
+const { isAdmin, managedCityId, managedCityName, cityList, loadCities, getCityName } = useRoleCityList()
+
 const loading = ref(false)
 const sending = ref(false)
 const broadcasting = ref(false)
 const list = ref<any[]>([])
 const sendVisible = ref(false)
 const broadcastVisible = ref(false)
+const selectedCityId = ref<number | undefined>()
 const searchForm = reactive({
   riderId: undefined as number | undefined,
@@ -143,6 +173,8 @@ const broadcastForm = reactive({
 const currentPage = ref(1)
 const pageSize = ref(20)
 const total = ref(0)
+const canQuery = computed(() => !!selectedCityId.value)
+const currentCityName = computed(() => selectedCityId.value ? getCityName(selectedCityId.value) : managedCityName.value || '-')
 const pagination = computed<TablePaginationConfig>(() => ({
   current: currentPage.value,
@@ -163,9 +195,15 @@ const columns = [
 ]
 async function loadList() {
+  if (!selectedCityId.value) {
+    list.value = []
+    total.value = 0
+    return
+  }
   loading.value = true
   try {
     const res: any = await messageApi.list({
+      cityId: selectedCityId.value,
       riderId: searchForm.riderId,
       type: searchForm.type,
       page: currentPage.value,
@@ -180,6 +218,16 @@ async function loadList() {
   }
 }
+function handleSearch() {
+  currentPage.value = 1
+  loadList()
+}
+
+function handleCityChange() {
+  currentPage.value = 1
+  loadList()
+}
+
 function handleTableChange(pag: TablePaginationConfig) {
   const nextPage = pag.current ?? 1
   if (nextPage === currentPage.value) return
@@ -187,24 +235,35 @@ function handleTableChange(pag: TablePaginationConfig) {
   loadList()
 }
+function ensureCitySelected() {
+  if (!selectedCityId.value) {
+    message.error('请先选择租户')
+    return false
+  }
+  return true
+}
+
 function openSend() {
+  if (!ensureCitySelected()) return
   Object.assign(sendForm, { riderId: undefined, type: 2, title: '', content: '' })
   sendVisible.value = true
 }
 function openBroadcast() {
+  if (!ensureCitySelected()) return
   Object.assign(broadcastForm, { type: 2, title: '', content: '' })
   broadcastVisible.value = true
 }
 async function handleSend() {
+  if (!ensureCitySelected()) return
   if (!sendForm.riderId || !sendForm.title || !sendForm.content) {
     message.error('请填写完整信息')
     return
   }
   sending.value = true
   try {
-    await messageApi.send(sendForm)
+    await messageApi.send({ ...sendForm, cityId: selectedCityId.value })
     message.success('发送成功')
     sendVisible.value = false
     loadList()
@@ -214,13 +273,14 @@ async function handleSend() {
 }
 async function handleBroadcast() {
+  if (!ensureCitySelected()) return
   if (!broadcastForm.title || !broadcastForm.content) {
     message.error('请填写完整信息')
     return
   }
   broadcasting.value = true
   try {
-    await messageApi.broadcast(broadcastForm)
+    await messageApi.broadcast({ ...broadcastForm, cityId: selectedCityId.value })
     message.success('群发成功')
     broadcastVisible.value = false
     loadList()
@@ -242,18 +302,26 @@ function formatTime(timestamp: number) {
   })
 }
-onMounted(loadList)
+onMounted(async () => {
+  await loadCities()
+  if (!isAdmin.value) {
+    selectedCityId.value = managedCityId.value
+    await loadList()
+  }
+})
 </script>
 <style scoped>
 .list-toolbar {
   display: flex;
   justify-content: space-between;
+  gap: 12px;
   margin-bottom: 16px;
 }
 .list-toolbar-left {
   display: flex;
+  flex-wrap: wrap;
   gap: 8px;
 }
@@ -261,4 +329,16 @@ onMounted(loadList)
   display: flex;
   gap: 8px;
 }
+
+.managed-city-pill {
+  display: inline-flex;
+  align-items: center;
+  min-height: 32px;
+  padding: 0 12px;
+  border: 1px solid var(--line);
+  border-radius: 10px;
+  background: var(--panel-strong);
+  color: var(--text-main);
+  font-size: 13px;
+}
 </style>
@@ -213,6 +213,7 @@ import {
   ControlOutlined,
   GlobalOutlined,
   HomeOutlined,
+  MessageOutlined,
   SettingOutlined,
   ShopOutlined,
   StarOutlined,
@@ -254,6 +255,7 @@ const iconOptions = [
   'TeamOutlined',
   'TrophyOutlined',
   'SettingOutlined',
+  'MessageOutlined',
 ]
 const iconMap: Record<string, any> = {
@@ -269,6 +271,7 @@ const iconMap: Record&lt;string, any&gt; = {
   TeamOutlined,
   TrophyOutlined,
   SettingOutlined,
+  MessageOutlined,
 }
 function resolveIcon(icon?: string) {
@@ -101,6 +101,7 @@ import {
   ControlOutlined,
   GlobalOutlined,
   HomeOutlined,
+  MessageOutlined,
   SettingOutlined,
   ShopOutlined,
   StarOutlined,
@@ -141,6 +142,7 @@ const iconMap: Record&lt;string, any&gt; = {
   TeamOutlined,
   TrophyOutlined,
   SettingOutlined,
+  MessageOutlined,
 }
 function resolveIcon(icon?: string) {