From c5d953ba49c140991ab2eb2fb5ee5978d1ae6f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Mon, 26 Feb 2024 19:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/template/table.vue                        | 33 ++++++++++++++-----
 .../online/eventStudy/index.vue               | 12 +++----
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/template/table.vue b/src/template/table.vue
index 62b3dbb0..eb8eba94 100644
--- a/src/template/table.vue
+++ b/src/template/table.vue
@@ -1,18 +1,28 @@
 <template>
-    <div class="default-main">
+    <div class='default-main'>
         <!-- 表头 -->
         <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label='关键词:'>
+                    <el-input
+                        style='width: 240px'
+                        v-model='tableStore.table.params.searchValue'
+                        clearable
+                        placeholder='仅根据用户名/登录名'
+                    />
+                </el-form-item>
+            </template>
             <template v-slot:operation>
-                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
+                <el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
             </template>
         </TableHeader>
         <!-- 表格 -->
-        <Table ref="tableRef" />
+        <Table ref='tableRef' />
         <!-- 弹框 -->
-        <PopupEdit ref="popupEdit" />
+        <PopupEdit ref='popupEdit' />
     </div>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { Plus } from '@element-plus/icons-vue'
 import { ref, onMounted, provide, defineOptions } from 'vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
@@ -75,7 +85,8 @@ const tableStore = new TableStore({
                     disabled: row => {
                         return row.state !== 1
                     },
-                    click: row => {}
+                    click: row => {
+                    }
                 },
                 {
                     name: 'edit',
@@ -91,7 +102,8 @@ const tableStore = new TableStore({
                             confirmButtonText: '确认',
                             cancelButtonText: '取消',
                             inputType: 'password'
-                        }).then(({ value }) => {})
+                        }).then(({ value }) => {
+                        })
                     }
                 },
                 {
@@ -103,7 +115,8 @@ const tableStore = new TableStore({
                     disabled: row => {
                         return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
                     },
-                    click: row => {}
+                    click: row => {
+                    }
                 },
                 {
                     name: 'edit',
@@ -114,7 +127,8 @@ const tableStore = new TableStore({
                     disabled: row => {
                         return row.state !== 1 && row.state !== 3
                     },
-                    click: row => {}
+                    click: row => {
+                    }
                 }
             ]
         }
@@ -142,6 +156,7 @@ const tableStore = new TableStore({
 
 provide('tableStore', tableStore)
 tableStore.table.params.searchState = 1
+tableStore.table.params.searchValue = ''
 tableStore.table.params.casualUser = -1
 tableStore.table.params.orderBy = ''
 onMounted(() => {
diff --git a/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue
index e59cdd64..abfe4ab8 100644
--- a/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -1,10 +1,12 @@
 <template>
     <div class='default-main'>
+        <!-- 表头 -->
         <TableHeader date-picker>
             <template v-slot:operation>
                 <el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
             </template>
         </TableHeader>
+        <!-- 表格 -->
         <Table ref='tableRef' />
     </div>
 </template>
@@ -15,12 +17,7 @@ import { ElMessageBox, ElMessage } from 'element-plus'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import PopupEdit from './popupEdit.vue'
 
-// 注意名字不要重复，若要保持页面存活，名字需要和路由admin后面的字符保持一致
-defineOptions({
-    name: 'auth/userlist'
-})
 const tableStore = new TableStore({
     url: '/user-boot/user/list',
     method: 'POST',
@@ -88,7 +85,6 @@ const tableStore = new TableStore({
                             cancelButtonText: '取消',
                             inputType: 'password'
                         }).then(({ value }) => {
-
                         })
                     }
                 },
@@ -102,7 +98,6 @@ const tableStore = new TableStore({
                         return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
                     },
                     click: row => {
-
                     }
                 },
                 {
@@ -115,7 +110,6 @@ const tableStore = new TableStore({
                         return row.state !== 1 && row.state !== 3
                     },
                     click: row => {
-
                     }
                 }
             ]
@@ -147,9 +141,11 @@ tableStore.table.params.searchState = 1
 tableStore.table.params.casualUser = -1
 tableStore.table.params.orderBy = ''
 onMounted(() => {
+    // 加载数据
     tableStore.index()
 })
 
 const addUser = () => {
+    popupEdit.value.open('新增用户')
 }
 </script>