From 747e1d1895bc167b77710892fff244d18320c886 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Fri, 6 Jun 2025 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shell.js        |  7 +++----
 src/views/ShellList.vue | 25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/api/shell.js b/src/api/shell.js
index d2ac778..62ef8d9 100644
--- a/src/api/shell.js
+++ b/src/api/shell.js
@@ -10,11 +10,10 @@ export const updateConfigShellService = (data) => {
 }
 
 export const deleteConfigShellService = (data) => {
-    const params = new URLSearchParams();
-    for (let key in data) {
-        params.append(key, data[key])
+    let reqData={
+        "shells": data.shells,
     }
-    return request.post('/shell/delete', params, { "headers": { 'token': data.token } });
+    return request.post('/shell/delete', reqData, { "headers": { 'token': data.token } });
 }
 
 export const addConfigShellService = (data) => {
diff --git a/src/views/ShellList.vue b/src/views/ShellList.vue
index 605f6f9..b27f815 100644
--- a/src/views/ShellList.vue
+++ b/src/views/ShellList.vue
@@ -1,9 +1,6 @@
 <script>
-import axios from "axios";
 import router from "@/router/index.js";
-import Cookies from "js-cookie";
 import { ElMessage } from "element-plus";
-import CryptoJS from "crypto-js";
 import Menu from "@/views/Menu.vue";
 
 import { getConfigShellListService } from "@/api/shell.js";
@@ -16,6 +13,7 @@ export default {
     return {
       ip: "",
       tableData: [],
+      loading: false,
       search_id: 2002,
       ConfigShellUpdateForm: {},
       keyword: "",
@@ -56,6 +54,7 @@ export default {
   methods: {
     async getConfigFileList() {
       let result = {};
+      this.loading = true;
       try {
         //判断search_id是字符串还是数字
         let req = {
@@ -65,6 +64,8 @@ export default {
         result = await getConfigShellListService(req);
       } catch (e) {
         console.log(e);
+      } finally {
+        this.loading = false;
       }
       let data = result.data;
       if (data !== undefined && data !== null) {
@@ -130,18 +131,15 @@ export default {
       if (!isDelete) {
         return;
       }
-      // alert("删除 index: " + index);
-      // return ;
-      let is_delete_file = confirm("是否删除文件?");
 
       let result = {};
       try {
         let req = {
           token: this.tokenData.token,
-          id: this.ConfigFileCurrentPageData[index].ID,
-          del_file: is_delete_file,
+          shells: [{"id":this.ConfigFileCurrentPageData[index].ID}],
         };
-        result = await deleteConfigFileService(req);
+        console.log("req:", req);
+        result = await deleteConfigShellService(req);
         if (result.code == 0) {
           ElMessage.success("删除成功");
           this.getConfigFileList();
@@ -398,7 +396,7 @@ export default {
           </el-dialog>
 
           <!-- 表格  :row-style="this.tableRowClassName"-->
-          <el-table :data="ConfigFileCurrentPageData" width="100%" border>
+          <el-table :data="ConfigFileCurrentPageData" width="100%" v-loading="loading">
             :row-style="tableRowClassName"
             <el-table-column prop="ID" label="id" width="80"></el-table-column>
             <el-table-column
@@ -409,6 +407,7 @@ export default {
             <el-table-column
               prop="ShellContent"
               label="命令内容"
+              show-overflow-tooltip
               width="120"
             ></el-table-column>
             <el-table-column
@@ -436,7 +435,7 @@ export default {
               label="创建用户ID"
               width="40"
             ></el-table-column>
-            <el-table-column label="操作" width="250">
+            <el-table-column label="操作" width="270">
               <template #default="scope">
                 <el-button
                   type="primary"
@@ -444,12 +443,12 @@ export default {
                   @click.prevent="updateConfigShell(scope.$index)"
                   >编辑</el-button
                 >
-                <!-- <el-button
+                <el-button
                   type="primary"
                   size="mini"
                   @click.prevent="deleteConfigFile(scope.$index)"
                   >删除</el-button
-                > -->
+                >
                 <el-button
                   type="primary"
                   size="mini"