From 5d9c8417283811883d0a28314e2bbb46280fa348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Mon, 6 Nov 2023 21:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/custom-query/data-adapter/index.vue | 16 +++-
 src/views/custom-query/datamodel/index.vue    | 54 ++++++++------
 src/views/custom-query/sql/index.vue          | 66 +++++++++--------
 src/views/custom-query/topo/index.vue         | 73 +++++++++----------
 src/views/monitor/logininfor/index.vue        | 17 ++++-
 src/views/monitor/operlog/index.vue           | 19 +++--
 6 files changed, 141 insertions(+), 104 deletions(-)

diff --git a/src/views/custom-query/data-adapter/index.vue b/src/views/custom-query/data-adapter/index.vue
index beeedf1..f57700d 100644
--- a/src/views/custom-query/data-adapter/index.vue
+++ b/src/views/custom-query/data-adapter/index.vue
@@ -30,9 +30,9 @@
   </el-form>
   <div class="query-btn">
     <el-button type="primary" v-perm="['query:adapter:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-    <popover-delete :name="adapterNameList" btn-type="danger" :type="'菜单'" :perm="['query:adapter:del']"
-                    :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
-                    @delete="handleDelete(adapterIds)"/>
+    <el-button type="danger" :icon="Delete" v-perm="['query:adapter:del']"
+               @click="handleMoreDelete(adapterIds)" :disabled="disabled" plain>删除
+    </el-button>
     <el-button type="warning" v-perm="['query:adapter:export']" @click="handleExport" :icon="Download" plain>导出
     </el-button>
   </div>
@@ -223,6 +223,16 @@ const handleDelete = async (adapterId) => {
     }
   })
 }
+//多删
+const handleMoreDelete=(adapterIds)=>{
+  ElMessageBox.confirm(`确认删除名称为${adapterNameList}的适配器吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(adapterIds)
+  })
+}
 //勾选table数据行事件
 const handleSelect = async (selection) => {
   if (selection.length !== 0) {
diff --git a/src/views/custom-query/datamodel/index.vue b/src/views/custom-query/datamodel/index.vue
index 008d4c9..05511bd 100644
--- a/src/views/custom-query/datamodel/index.vue
+++ b/src/views/custom-query/datamodel/index.vue
@@ -20,8 +20,9 @@
     </el-form>
     <div class="query-btn">
       <el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <popover-delete :name="sourceName" btn-type="danger" :type="'数据模型'" :is-plain="true" :btn-icon="Delete" :is-disabled="disabled" :perm="['query:source:del']"
-                      @delete="handleDelete(sourceId)"/>
+      <el-button type="danger" :icon="Delete" v-perm="['query:source:del']"
+                 @click="handleMoreDelete(sourceId)" :disabled="disabled" plain>删除
+      </el-button>
       <el-button type="warning" v-perm="['query:source:export']" @click="handleExport" :icon="Download" plain>导出
       </el-button>
     </div>
@@ -42,14 +43,14 @@
         <el-table-column prop="type" label="数据模型类型" align="center"/>
         <el-table-column prop="confType" label="数据模型配置类型" align="center">
           <template #default="scope">
-            <tag dict-type="data_source_config"  :value="scope.row.configType"/>
+            <tag dict-type="data_source_config" :value="scope.row.configType"/>
           </template>
         </el-table-column>
         <el-table-column prop="url" label="数据模型连接地址" align="center"/>
         <el-table-column label="操作" align="center">
           <template #default="scope">
             <el-button type="text" size="mini" v-perm="['query:source:edit']"
-                       @click="handleEdit(scope.row.id)" >编辑
+                       @click="handleEdit(scope.row.id)">编辑
             </el-button>
             <popover-delete :name="scope.row.dsName" :type="'数据模型'" :perm="['query:source:del']"
                             @delete="handleDelete(scope.row.id)"/>
@@ -192,27 +193,27 @@ const formRules = ref({
   host: [{required: true, message: '请输入数据模型服务地址', trigger: 'blur'}],
   dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}],
   url: [{required: true, message: '请输入数据模型连接地址', trigger: 'blur'}],
-  params:{
+  params: {
     serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}],
     namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}]
   }
 })
-const getTypeOption=()=>{
-  getDataSourceType().then(res=>{
-    typeList.value=res.data
+const getTypeOption = () => {
+  getDataSourceType().then(res => {
+    typeList.value = res.data
   })
 }
 
 const handleTypeChange = (type) => {
-  if (form.value.configType !== 1){
+  if (form.value.configType !== 1) {
     return;
   }
-  if (type === 'ORACLE'){
+  if (type === 'ORACLE') {
     form.value.params = {
       serviceName: ''
     }
   }
-  if (type === 'POSTGRES'){
+  if (type === 'POSTGRES') {
     form.value.params = {
       namespace: ''
     }
@@ -301,7 +302,7 @@ const handleAdd = async () => {
   restFrom()
   title.value = "新增数据模型管理"
   isVisited.value = true
-  nextTick(()=>{
+  nextTick(() => {
     // 清空校验
     formInstance.value.clearValidate()
   })
@@ -316,7 +317,7 @@ const handleEdit = async (id) => {
       form.value = res.data
       title.value = "编辑数据模型管理"
       isVisited.value = true
-      nextTick(()=>{
+      nextTick(() => {
         // 清空校验
         formInstance.value.clearValidate()
       })
@@ -358,16 +359,25 @@ const handleCurrentChange = async (val) => {
 }
 //删除
 const handleDelete = async (id) => {
-    delDataSourceManage(id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
+  delDataSourceManage(id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      getList()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+//多删
+const handleMoreDelete = (sourceId) => {
+  ElMessageBox.confirm(`确认删除名称为${sourceName}的数据模型吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(sourceId)
+  })
 }
-
 getTypeOption()
 getList()
 </script>
diff --git a/src/views/custom-query/sql/index.vue b/src/views/custom-query/sql/index.vue
index e4f189e..7f99521 100644
--- a/src/views/custom-query/sql/index.vue
+++ b/src/views/custom-query/sql/index.vue
@@ -17,9 +17,9 @@
     </el-form>
     <div class="query-btn">
       <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <popover-delete :name="uqNameList" btn-type="danger" :type="'SQL查询'"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
-                      @delete="handleDelete(uqIds)"/>
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -34,8 +34,8 @@
         <el-table-column label="序号" type="index" width="60" align="center"/>
         <el-table-column prop="uqName" label="名称" align="center"/>
         <el-table-column prop="dataSourceId" label="数据源" align="center">
-          <template  #default="scope">
-            <el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag>
+          <template #default="scope">
+            <el-tag>{{ getDataSourceOptionItem(scope.row.dataSourceId) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="publish" label="发布类型" align="center">
@@ -50,12 +50,12 @@
           <template #default="scope">
             <div v-if="scope.row.publish == false">
               <el-button type="text" size="mini"
-                         @click="handleEdit(scope.row.id)" >编辑
+                         @click="handleEdit(scope.row.id)">编辑
               </el-button>
               <el-button type="text" size="mini"
-                         @click="handleDesign(scope.row)" >设计
+                         @click="handleDesign(scope.row)">设计
               </el-button>
-              <popover-delete :name="scope.row.uqName"  :type="'SQL查询'"
+              <popover-delete :name="scope.row.uqName" :type="'SQL查询'"
                               @delete="handleDelete(scope.row.id)"/>
             </div>
             <div v-else>
@@ -154,13 +154,13 @@ const formRules = ref({
   uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}],
 })
 //获取数据源select的option
-const getOption =async () => {
-   await getDataSourceOption().then(res => {
-      if (res.code === 1000) {
-        dataSourceOption.value = res.data
-        // getList();
-      }
-    })
+const getOption = async () => {
+  await getDataSourceOption().then(res => {
+    if (res.code === 1000) {
+      dataSourceOption.value = res.data
+      // getList();
+    }
+  })
 }
 
 const getDataSourceOptionItem = (dataSourceId) => {
@@ -258,22 +258,24 @@ const handleDownLine = (row) => {
 
 //单个删除
 const handleDelete = async (id) => {
-  // let list = []
-  // list.push(row.id)
-  // ElMessageBox.confirm(`确认删除名称为${row.uqName}的数据吗?`, '系统提示', {
-  //   confirmButtonText: '确定',
-  //   cancelButtonText: '取消',
-  //   type: 'warning'
-  // }).then(() => {
-    delSql(id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  // })
+  delSql(id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      getList()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+//多删
+const handleMoreDelete = (uqIds) => {
+  ElMessageBox.confirm(`确认删除名称为${uqNameList}的SQL查询吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(uqIds)
+  })
 }
 //取消
 const handleCancel = () => {
@@ -314,7 +316,7 @@ const handleSubmit = async (instance) => {
 const handleSelect = async (selection) => {
   if (selection.length !== 0) {
     disabled.value = false
-    uqIds.value=selection.map(item => item.id).join()
+    uqIds.value = selection.map(item => item.id).join()
     uqNameList.value = selection.map(item => item.uqName).join()
   } else {
     disabled.value = true
diff --git a/src/views/custom-query/topo/index.vue b/src/views/custom-query/topo/index.vue
index 1aec7fa..0171264 100644
--- a/src/views/custom-query/topo/index.vue
+++ b/src/views/custom-query/topo/index.vue
@@ -17,9 +17,9 @@
     </el-form>
     <div class="query-btn">
       <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <popover-delete :name="uqNameList" btn-type="danger" :type="'拓扑图查询'"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
-                      @delete="handleDelete(uqIds)"/>
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -34,8 +34,8 @@
         <el-table-column label="序号" type="index" width="60" align="center"/>
         <el-table-column prop="uqName" label="名称" align="center"/>
         <el-table-column prop="dataSourceId" label="数据源" align="center">
-          <template  #default="scope">
-            <el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag>
+          <template #default="scope">
+            <el-tag>{{ getDataSourceOptionItem(scope.row.dataSourceId) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="publish" label="发布类型" align="center">
@@ -50,12 +50,12 @@
           <template #default="scope">
             <div v-if="scope.row.publish == false">
               <el-button type="text" size="mini"
-                         @click="handleEdit(scope.row.id)" >编辑
+                         @click="handleEdit(scope.row.id)">编辑
               </el-button>
               <el-button type="text" size="mini"
-                         @click="handleDesign(scope.row)" >设计
+                         @click="handleDesign(scope.row)">设计
               </el-button>
-              <popover-delete :name="scope.row.uqName"  :type="'拓扑图查询'"
+              <popover-delete :name="scope.row.uqName" :type="'拓扑图查询'"
                               @delete="handleDelete(scope.row.id)"/>
             </div>
             <div v-else>
@@ -117,7 +117,7 @@
 </template>
 
 <script setup>
-import {Search, Refresh, Plus, Delete, Edit,Bottom,View} from '@element-plus/icons-vue'
+import {Search, Refresh, Plus, Delete, Edit, Bottom, View} from '@element-plus/icons-vue'
 import {ElMessage, ElMessageBox} from "element-plus";
 import {useRouter} from "vue-router";
 import {getTopoList, delTopo, addTopo, editTopo, getTopoDetails} from "@/api/custom-query/topo";
@@ -164,7 +164,7 @@ const getOption = () => {
   })
 }
 const getDataSourceOptionItem = (dataSourceId) => {
-  if(dataSourceOption.value===undefined)return;
+  if (dataSourceOption.value === undefined) return;
   for (let item of dataSourceOption.value) {
     if (item.value === dataSourceId) {
       return item.label;
@@ -257,32 +257,29 @@ const handleDownLine = (row) => {
   })
 }
 //查看
-const handleView=(id)=>{
+const handleView = (id) => {
   //router.push({path: `/custom/query/page/${id}`})
 }
 //单个删除
 const handleDelete = async (id) => {
-  // let list = []
-  // if(Array.isArray(id)){
-  //   list=Object.values(id)
-  // }else {
-  //   list.push(id)
-  // }
-  // console.log(list,'list')
-  // ElMessageBox.confirm(`确认删除名称为${row.uqName}的拓扑图吗?`, '系统提示', {
-  //   confirmButtonText: '确定',
-  //   cancelButtonText: '取消',
-  //   type: 'warning'
-  // }).then(() => {
-    delTopo(id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  // })
+  delTopo(id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      getList()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+//多删
+const handleMoreDelete = (uqIds) => {
+  ElMessageBox.confirm(`确认删除名称为${uqNameList}的拓扑图查询吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(uqIds)
+  })
 }
 //取消
 const handleCancel = () => {
@@ -322,7 +319,7 @@ const handleSubmit = async (instance) => {
 const handleSelect = async (selection) => {
   if (selection.length !== 0) {
     disabled.value = false
-    uqIds.value=selection.map(item => item.id).join()
+    uqIds.value = selection.map(item => item.id).join()
     uqNameList.value = selection.map(item => item.uqName).join()
   } else {
     disabled.value = true
@@ -343,11 +340,11 @@ getOption()
 getList()
 </script>
 
-<style  lang="scss">
-.red-warning{
-  .el-message-box__content{
-    .el-message-box__container{
-      .el-icon{
+<style lang="scss">
+.red-warning {
+  .el-message-box__content {
+    .el-message-box__container {
+      .el-icon {
         color: red !important;
       }
     }
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 3ff07b3..37f3748 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -35,9 +35,9 @@
       </el-form-item>
     </el-form>
     <div class="query-btn">
-      <popover-delete :name="infoId" btn-type="danger" :type="'日志'"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
-                      @delete="handleDelete(infoId)"/>
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(infoId)" :disabled="disabled" plain>删除
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -169,7 +169,16 @@ const handleDelete = async (infoId) => {
     }
   })
 }
-
+//多删
+const handleMoreDelete = (infoId) => {
+  ElMessageBox.confirm(`确认删除名称为${infoId}的日志吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(infoId)
+  })
+}
 //勾选table数据行的 Checkbox, 多/单选删除功能
 const handleSelect = async (selection) => {
   if (selection.length !== 0) {
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 30a4c82..ac4e05f 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -45,9 +45,9 @@
       </el-form-item>
     </el-form>
     <div class="query-btn">
-      <popover-delete :name="operIds" btn-type="danger" :type="'日志'"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
-                      @delete="handleDelete(operIds)"/>
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(operIds)" :disabled="disabled" plain>删除
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -83,7 +83,7 @@
         <el-table-column label="操作" align="center">
           <template #default="scope">
             <el-button type="text" size="mini" @click="handleViewDetails(scope.row.operId)" >详细</el-button>
-            <popover-delete :name="operIds"  :type="'日志'"
+            <popover-delete :name="scope.row.operId"  :type="'日志'"
                             @delete="handleDelete(scope.row.operId)"/>
           </template>
         </el-table-column>
@@ -267,7 +267,16 @@ const handleDelete = async (operId) => {
     }
   });
 };
-
+//多删
+const handleMoreDelete = (operIds) => {
+  ElMessageBox.confirm(`确认删除名称为${operIds}的日志吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(operIds)
+  })
+}
 //勾选table数据行的 Checkbox, 实现单/多选删除功能
 const handleSelect = async (selection) => {
   if (selection.length !== 0) {