From 6bdabf473a8d0a1416d064ac46a40c75aa7814fc Mon Sep 17 00:00:00 2001
From: wanghaohao <wanghaohao@kylinos.cn>
Date: Wed, 30 Oct 2024 14:58:13 +0800
Subject: [PATCH] remove department and user from list and modify style

---
 web/src/components/PmTable.vue | 69 ++++++++--------------------------
 web/src/views/alertList.vue    |  1 -
 web/src/views/ruleList.vue     |  2 -
 3 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/web/src/components/PmTable.vue b/web/src/components/PmTable.vue
index c76d645..890ae03 100644
--- a/web/src/components/PmTable.vue
+++ b/web/src/components/PmTable.vue
@@ -4,26 +4,13 @@
     <el-row class="pm_table_header">
       <div class="pm_table_header_operation">
         <!-- 全选 -->
-        <el-dropdown
-          v-if="props.showCheck"
-          split-button
-          type="primary"
-          class="operation-select-checkbox"
-          @command="handleCheckChange"
-          @click.stop="handleCheckClick($event, !checkedState)"
-        >
-          <el-checkbox
-            v-model="checkedState"
-            @change.native="handleCheckState"
-          />
-          <span class="operation-select-spanText" v-show="checkedState"
-            >选择个数（{{ checkedCount }}个）</span
-          >
+        <el-dropdown v-if="props.showCheck" split-button class="operation-select-checkbox" @command="handleCheckChange"
+          @click.stop="handleCheckClick($event, !checkedState)">
+          <el-checkbox v-model="checkedState" @change.native="handleCheckState" />
+          <span class="operation-select-spanText" v-show="checkedState">选择个数（{{ checkedCount }}个）</span>
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item command="不选择"
-                >不选择（0个）</el-dropdown-item
-              >
+              <el-dropdown-item command="不选择">不选择（0个）</el-dropdown-item>
               <el-dropdown-item command="选择当前页">{{
                 "选择当前页（" + currentNum + "个）"
               }}</el-dropdown-item>
@@ -35,22 +22,11 @@
         </el-dropdown>
         <!-- 模糊搜索 -->
         <div class="operation-select-input">
-          <el-autocomplete
-            v-if="props.showSearch"
-            v-model="keyWord"
-            :fetch-suggestions="querySearch"
-            popper-class="my-autocomplete"
-            placeholder="请输入内容"
-            clearable
-            @clear="handleIpSearch"
-            @select="handleIpSearch"
-            @keyup.enter="handleInputIP"
-          >
+          <el-autocomplete v-if="props.showSearch" v-model="keyWord" :fetch-suggestions="querySearch"
+            popper-class="my-autocomplete" placeholder="请输入内容" clearable @clear="handleIpSearch" @select="handleIpSearch"
+            @keyup.enter="handleInputIP">
             <template #prefix>
-              <el-icon
-                class="el-input__icon"
-                @click="handleIpSearch({ ip: keyWord })"
-              >
+              <el-icon class="el-input__icon" @click="handleIpSearch({ ip: keyWord })">
                 <Search />
               </el-icon>
             </template>
@@ -72,15 +48,8 @@
     </el-row>
     <!-- 列表 -->
     <div class="pm_table_content" ref="tableBox">
-      <el-table
-        ref="multipleTableRef"
-        :data="tableData"
-        :row-key="(row: any) => row.id"
-        class="table"
-        @select="handleRowSelectionChange"
-        @selection-change="handleSelectinChange"
-        v-loading="loading"
-      >
+      <el-table ref="multipleTableRef" :data="tableData" :row-key="(row: any) => row.id" class="table"
+        @select="handleRowSelectionChange" @selection-change="handleSelectinChange" v-loading="loading">
         <slot></slot>
         <template #append>
           <slot name="append"></slot>
@@ -93,18 +62,10 @@
     <!-- 分页 -->
     <div class="pm_table_page">
       <el-config-provider :locale="zhCn">
-        <el-pagination
-          v-model:current-page="page.currentPage"
-          v-model:page-size="page.pageSize"
-          popper-class="pagePopper"
-          :page-sizes="[20, 25, 50, 75, 100]"
-          :small="page.small"
-          :background="page.background"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="page.total"
-          @size-change="getTableData(true)"
-          @current-change="getTableData(true)"
-        />
+        <el-pagination v-model:current-page="page.currentPage" v-model:page-size="page.pageSize" popper-class="pagePopper"
+          :page-sizes="[20, 25, 50, 75, 100]" :small="page.small" :background="page.background"
+          layout="total, sizes, prev, pager, next, jumper" :total="page.total" @size-change="getTableData(true)"
+          @current-change="getTableData(true)" />
       </el-config-provider>
     </div>
   </div>
diff --git a/web/src/views/alertList.vue b/web/src/views/alertList.vue
index c9240fb..24f08ca 100644
--- a/web/src/views/alertList.vue
+++ b/web/src/views/alertList.vue
@@ -31,7 +31,6 @@
       <el-table-column type="selection" :reserve-selection="true" width="50" />
       <el-table-column prop="id" label="ID" width="80" />
       <el-table-column prop="ip" label="IP" width="180" />
-      <el-table-column prop="departmentName" label="部门" width="180" />
       <el-table-column prop="alertName" label="告警名称" width="220" />
       <el-table-column prop="level" label="告警级别" width="180" />
       <el-table-column prop="alertTime" label="告警开始时间" width="200" />
diff --git a/web/src/views/ruleList.vue b/web/src/views/ruleList.vue
index 8423385..f7feabc 100644
--- a/web/src/views/ruleList.vue
+++ b/web/src/views/ruleList.vue
@@ -26,8 +26,6 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="departmentName" label="部门" width="180" />
-      <el-table-column prop="userName" label="用户" width="160" />
       <el-table-column prop="severity" label="告警级别" width="220" />
       <el-table-column prop="metrics" label="告警指标" width="260" />
       <el-table-column prop="threshold" label="告警阈值">
-- 
Gitee