From 613ec16ad398c604547281394aa378036be56b6b Mon Sep 17 00:00:00 2001
From: zhanghan2021 <zhanghan@kylinos.cn>
Date: Wed, 13 Dec 2023 15:07:54 +0800
Subject: [PATCH] Interface for docking multiple selection deletion and
 advanced search functions

---
 atune/server/dao/runresultdao.go   |  2 +-
 atune/web/src/components/table.vue | 20 ++++++++++++--------
 atune/web/src/views/ResultInfo.vue | 14 ++++++++++----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/atune/server/dao/runresultdao.go b/atune/server/dao/runresultdao.go
index 714b4be7..d5b014a8 100644
--- a/atune/server/dao/runresultdao.go
+++ b/atune/server/dao/runresultdao.go
@@ -8,7 +8,7 @@ import (
 
 func QueryResults(query *response.PaginationQ) ([]*model.RunResult, int64, error) {
 	var results []*model.RunResult
-	if err := db.MySQL().Limit(query.PageSize).Offset((query.Page - 1) * query.PageSize).Find(&results).Error; err != nil {
+	if err := db.MySQL().Order("id desc").Limit(query.PageSize).Offset((query.Page - 1) * query.PageSize).Find(&results).Error; err != nil {
 		return nil, 0, err
 	}
 
diff --git a/atune/web/src/components/table.vue b/atune/web/src/components/table.vue
index f5aa7b9d..31200cee 100644
--- a/atune/web/src/components/table.vue
+++ b/atune/web/src/components/table.vue
@@ -12,7 +12,7 @@
         </div>
         <div class="content">
           <div  v-loading="loading" element-loading-text="数据加载中" element-loading-spinner="el-icon-loading">
-            <el-table :data="props.tableData" height="100%" :header-cell-style="{ color: 'black', 'background-color': '#f6f8fd' }"
+            <el-table :data="props.tableData" @selection-change="onSelectionChange" height="100%" :header-cell-style="{ color: 'black', 'background-color': '#f6f8fd' }"
             :cell-style="{ color: 'black' }"  tooltip-effect="dark">
             <el-table-column type="selection"  width="55" align="center" ></el-table-column>
             <slot name="table"></slot>
@@ -31,9 +31,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref,watch,onMounted } from 'vue';
+import { ref, watch, onMounted, toRaw } from 'vue';
 
-const emit = defineEmits(['update:pageSize', 'update:currentPage']);
+const emit = defineEmits(['update:pageSize', 'update:currentPage','update:selectedData']);
 let props = defineProps({
   loading:{
     type:Boolean,
@@ -43,10 +43,6 @@ let props = defineProps({
     type:Array,
     default:[]
   },
-  searchKey: {
-    type: String,
-    default: ""
-  },
   searchTune: {
     type: Boolean,
     default: false
@@ -69,10 +65,18 @@ let props = defineProps({
   },
 })
 
-
 const currentPage = ref(props.currentPage);
 const pageSize = ref(props.pageSize);
 
+const onSelectionChange = (val: any[]) => {
+    let d: any[] = []
+    val.forEach((item: any) => {
+        d.push(toRaw(item))
+    })
+
+    emit('update:selectedData', d)
+}
+
 const onPageSizeChange = (newSize:number) => {
     pageSize.value = newSize;
     emit('update:pageSize', newSize);
diff --git a/atune/web/src/views/ResultInfo.vue b/atune/web/src/views/ResultInfo.vue
index 89bc7613..9f38bca2 100644
--- a/atune/web/src/views/ResultInfo.vue
+++ b/atune/web/src/views/ResultInfo.vue
@@ -12,11 +12,12 @@
         :pageSize.sync="pageSize" 
         :currentPage.sync="currentPage"
         @update:pageSize="onPageSizeChange" 
-        @update:currentPage="onCurrentPageChange">
+        @update:currentPage="onCurrentPageChange"
+        @update:selectedData="onSelectionChange">
       <template v-slot:table_search>
         <el-input placeholder="请输入IP地址进行搜索..." :prefix-icon="Search" clearable
-          style="width: 280px;margin-right: 10px;" v-model="searchIP" :searchKey="searchIP" @keydown.enter.native="searchResult"></el-input>
-        <el-button :icon="Search" @click="searchResult">搜索</el-button>
+          style="width: 280px;margin-right: 10px;" v-model="searchIP" @keydown.enter.native="searchData"></el-input>
+        <el-button :icon="Search" @click="searchData">搜索</el-button>
         <el-button class="delete-button" @click="handleDelete">删除</el-button>
       </template>
       <template v-slot:table :loading="loading">
@@ -46,7 +47,6 @@ const pageSize = ref(10);
 const loading=ref(false)
 const selectedRows = ref<any[]>([])
 
-
 // 获取执行结果
 function getData() {
   getResultLists({
@@ -102,6 +102,7 @@ const handleDelete = () => {
       })
       deleteResult({ ids: ids.value }).then(res => {
         if (res.data.code === 200) {
+          getData()
           ElMessage.success(res.data.msg)
         } else {
           ElMessage.error(res.data.msg)
@@ -112,6 +113,11 @@ const handleDelete = () => {
     })
 }
 
+// 选中多选框
+const onSelectionChange = (selection: any[]) => {
+  selectedRows.value = selection;
+};
+
 const onPageSizeChange = (newSize:number) => {
   pageSize.value = newSize;
   getData();
-- 
Gitee