Bladeren bron

图标更新、日志监控、用户查询更新

吴朋磊 1 week geleden
bovenliggende
commit
d68a025c2d

+ 1 - 1
index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_4939100_i0i4t6ghfug.css">
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_4939100_4d2bva7l2pq.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="robots" content="noindex, nofollow" />
     <title>后台管理系统</title>

+ 14 - 2
src/layout/components/SiderBar.vue

@@ -64,6 +64,18 @@ onMounted(() => {
       menu.route !== '/main/logMonitor' && menu.route !== '/main/performanceMonitor'
     )
 
+    // 统一修正菜单项图标
+    const iconMap: Record<string, string> = {
+      '/main/userSearch': 'icon_yonghuchaxun',
+      '/main/logMonitor': 'icon_rizhijiankong',
+      '/main/performanceMonitor': 'icon_yewujiankong',
+    }
+    menuItems.value?.forEach(menu => {
+      if (iconMap[menu.route]) {
+        menu.icon = iconMap[menu.route]
+      }
+    })
+
     // 通过 userInfo 判断是否为运维人员
     // 如果是运维账号(没有管理员相关菜单或特定字段),则不添加日志监控和业务监控
     const userInfo = userInfoStr ? JSON.parse(userInfoStr) : {}
@@ -80,13 +92,13 @@ onMounted(() => {
       // 非运维人员且有管理员菜单,添加日志监控和业务监控
       const additionalMenuList = [
         {
-          icon: "icon_xuexiaoguanli",
+          icon: "icon_rizhijiankong",
           route: "/main/logMonitor",
           title: "日志监控",
           label:'',
         },
         {
-          icon: "icon_xuexiaoguanli",
+          icon: "icon_yewujiankong",
           route: "/main/performanceMonitor",
           title: "业务监控",
           label:'',

+ 2 - 2
src/views/logMonitor/index.vue

@@ -16,9 +16,9 @@
                     <div class="content_left" >
                         <FormSearchGroup :searchList="differentTypeLogSearchList" @searchChange="handleSearchChange"></FormSearchGroup>
                     </div>
-                    <div class="content_right">
+                    <!-- <div class="content_right">
                         <el-button type="primary" @click="handleSearch">查询</el-button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="page_jg_10"></div>

+ 3 - 2
src/views/performanceMonitor/index.vue

@@ -221,7 +221,7 @@ const mainLineChartData = reactive({
 const chartDetailDataList = ref<any[]>([])
 const schoolChartDetailDataList = ref<any[]>([])
 
-const handleDataPointClick = async (payload: { dataIndex: number; schoolList: any[]; rawData: any }) => {
+const handleDataPointClick = async (payload: { dataIndex: number; schoolList: any[]; rawData: any; title?: string }) => {
     // 更新柱状图数据
     if (payload.schoolList && payload.schoolList.length > 0) {
         barChartData.datax = payload.schoolList.map((item: any) => item.xname ?? '')
@@ -235,7 +235,8 @@ const handleDataPointClick = async (payload: { dataIndex: number; schoolList: an
             await fetchSchoolLineChartData(firstSchoolId)
         }
     } else {
-        console.warn('schoolList 为空,无法更新柱状图')
+        // schoolList 为空时,清空柱状图与学校折线图,避免上一次的数据残留
+        resetBarAndSchoolChart()
     }
 
     // 直接使用 tooltip 中已经渲染正确的 title 作为当前轴标签

+ 32 - 7
src/views/userSearch/index.vue

@@ -17,6 +17,9 @@
                         <FormSearchGroup :searchList="searchList" 
                             @searchChange="HandleUserSearchChange"></FormSearchGroup>
                     </div>
+                    <div class="content_right">
+                        <el-button type="primary" @click="handleSearch">查询</el-button>
+                    </div>
                 </div>
             </div>
 
@@ -47,6 +50,8 @@ import Table from '@/baseComponents/Table.vue';
 
 import TableRowStatus from '@/baseComponents/TableRowStatus.vue';
 
+import { ElMessage } from 'element-plus'
+
 import {getUserInfoApi} from '@/api/userSearch'
 import {searchList} from './formSearchGroup'
 import {tableColumns} from './table'
@@ -74,12 +79,9 @@ const GetUserInfo = async ()=>{
        totalNum.value = res.data.total
     }
 }
-// 处理搜索项变化
-const HandleUserSearchChange = async (params:any,key:any)=>{
-    console.log('查询参数',params)
-    console.log('查询key',key)
+// 处理搜索项变化(仅更新参数,不调用接口;接口由"查询"按钮触发)
+const HandleUserSearchChange = (params:any,key:any)=>{
     searchParams.value = {...params}
-    await GetUserInfo()
 }
 
 // 处理分页变化
@@ -91,6 +93,16 @@ const HandlePaginationChange = async (params:any)=>{
     await GetUserInfo()
 }
 
+// 处理查询
+const handleSearch = async ()=>{
+    const { userAccount, phone } = searchParams.value
+    if (!userAccount && !phone) {
+        ElMessage.warning('请输入账号或手机号')
+        return
+    }
+    currentPage.value = 1
+    await GetUserInfo()
+}
 
 // 用户身份类型状态转换
 const IdentityTypeNumToName = (type:any)=>{
@@ -124,7 +136,7 @@ const userStatusMsg = ref([
 ])
 onMounted(async ()=>{
     // 初次加载不查询
-    await GetUserInfo()
+    // await GetUserInfo()
 })
 </script>
 
@@ -132,5 +144,18 @@ onMounted(async ()=>{
 
 
 <style lang="scss" scoped>
-
+.page_search{
+    .search_content{
+        justify-content: flex-start;
+        gap: 20px;
+        .content_right{
+            :deep(.el-button){
+                width: 100px !important;
+                background-color: #2e64fa !important;
+                color: #fff !important;
+                border: none !important;
+            }
+        }
+    }
+}
 </style>