邓洁 : 修改页面细节

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']"
+    <el-button type="danger" :icon="Delete" v-perm="['query:adapter:del']"
-                    :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
+               @click="handleMoreDelete(adapterIds)" :disabled="disabled" plain>删除
-                    @delete="handleDelete(adapterIds)"/>
+    </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) {

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']"
+      <el-button type="danger" :icon="Delete" v-perm="['query:source:del']"
-                      @delete="handleDelete(sourceId)"/>
+                 @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>
@@ -367,7 +368,16 @@ const handleDelete = async (id) => {
     }
   })
 }
-
+//多删
+const handleMoreDelete = (sourceId) => {
+  ElMessageBox.confirm(`确认删除名称为${sourceName}的数据模型吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(sourceId)
+  })
+}
 getTypeOption()
 getList()
 </script>

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查询'"
+      <el-button type="danger" :icon="Delete"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
+                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
-                      @delete="handleDelete(uqIds)"/>
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -258,13 +258,6 @@ 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)
@@ -273,7 +266,16 @@ const handleDelete = async (id) => {
       ElMessage.error(res.msg)
     }
   })
-  // })
+}
+//多删
+const handleMoreDelete = (uqIds) => {
+  ElMessageBox.confirm(`确认删除名称为${uqNameList}的SQL查询吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(uqIds)
+  })
 }
 //取消
 const handleCancel = () => {

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="'拓扑图查询'"
+      <el-button type="danger" :icon="Delete"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
+                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
-                      @delete="handleDelete(uqIds)"/>
+      </el-button>
     </div>
     <div class="table">
       <el-table
@@ -262,18 +262,6 @@ const handleView=(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)
@@ -282,7 +270,16 @@ const handleDelete = async (id) => {
       ElMessage.error(res.msg)
     }
   })
-  // })
+}
+//多删
+const handleMoreDelete = (uqIds) => {
+  ElMessageBox.confirm(`确认删除名称为${uqNameList}的拓扑图查询吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(uqIds)
+  })
 }
 //取消
 const handleCancel = () => {

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="'日志'"
+      <el-button type="danger" :icon="Delete"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
+                 @click="handleMoreDelete(infoId)" :disabled="disabled" plain>删除
-                      @delete="handleDelete(infoId)"/>
+      </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) {

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="'日志'"
+      <el-button type="danger" :icon="Delete"
-                      :is-disabled="disabled" :is-plain="true" :btn-icon="Delete"
+                 @click="handleMoreDelete(operIds)" :disabled="disabled" plain>删除
-                      @delete="handleDelete(operIds)"/>
+      </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) {