增加了删除

src/views/dataAdmin/assembly/index.vue

@@ -7,7 +7,7 @@
         </Authority>
         <Authority>
           <!-- <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)"> -->
-          <a-button type="primary" color="error" :disabled="hasBatchDelete" @click="deleteSelectAll"> 批量删除 </a-button>
+          <a-button type="primary" color="error" :disabled="hasBatchDelete" @click="deleteSelect"> 批量删除 </a-button>
           <!-- </Popconfirm> -->
         </Authority>
       </template>
@@ -52,10 +52,11 @@
             color: 'error',
             ifShow: record.roleType != RoleEnum.SYS_ADMIN,
             disabled: record.status == 3 ? false : true,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDelete.bind(null, record),
-            },
+            onClick: deleteSelect.bind(null, record),
+            // popConfirm: {
+            //   title: '是否确认删除',
+            //   confirm: deleteSelect.bind(null, record),
+            // },
           },
         ]" />
       </template>
@@ -189,26 +190,19 @@ export default defineComponent({
       if (e.servicealiasname) window.open(`../../mapview.html?onlineIde_${e.servicealiasname}`, '_blank');
     }
 
-    //删除所在行数据
-    const handleDelete = async (record: Recordable) => {
-      if (record?.serviceid) {
-        const res = await deleteService(record?.serviceid)
-        if (res?.status !== '-1') {
-          reload();
-          createMessage.success('删除成功！', 1)
-        }
-        else {
-          createMessage.error('删除失败！失败原因：' + res?.message, 1)
-        }
-      }
-    }
-
     //删除所有选中
-    function deleteSelectAll() {
-      uiTool.delModal('确定删除选中的组件？', () => {
-        handleDelete({
-          serviceid: getSelectRows().map(i => i.serviceid).toString()
-        })
+    function deleteSelect(record) {
+      uiTool.delModal('确定删除选中的组件资源？', async () => {
+        var ids = record?.serviceid ? record.serviceid : getSelectRows().map(i => i.serviceid).toString()
+        if (ids) {
+          const res = await deleteService(ids)
+          if (res?.status !== '-1') {
+            reload();
+            createMessage.success('删除成功！', 1)
+          } else {
+            createMessage.error('删除失败！失败原因：' + res?.message, 1)
+          }
+        }
       })
     }
 
@@ -276,7 +270,7 @@ export default defineComponent({
 
     return {
       handleSee,
-      deleteSelectAll,
+      deleteSelect,
       sendApprove,
       moment,
       createMessage,
@@ -285,7 +279,6 @@ export default defineComponent({
       handleCreate,
       see,
       handleEdit,
-      handleDelete,
       handleSuccess,
       RoleEnum,
       hasBatchDelete,

src/views/dataAdmin/dataAdmin/fileResourceUpload/index.vue

@@ -5,16 +5,14 @@
     <BasicTable :rowSelection="{ type: 'checkbox' }" @register="registerTable" :clickToRowSelect="false">
       <!-- 表格右上角按钮 -->
       <template #toolbar>
-        <!-- <Authority :value="authList.addAuth">
-          <a-button type="primary" @click="addMethod" >新增文件</a-button>
-        </Authority> -->
         <Authority>
           <a-button type="primary" @click="addMethod">新增文件</a-button>
         </Authority>
-        <Authority :value="authList.deleteAuth">
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
-            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
-          </Popconfirm>
+        <Authority>
+          <!-- <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)"> -->
+          <a-button @click="handleDelete" type="primary" color="error" :disabled="hasBatchDelete"> 批量删除
+          </a-button>
+          <!-- </Popconfirm> -->
         </Authority>
       </template>
       <!-- 表格操作栏 -->
@@ -55,10 +53,7 @@
             color: 'error',
             ifShow: true,
             disabled: record.status == 3 ? false : true,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDelete.bind(null, record),
-            },
+            onClick: handleDelete.bind(null, record),
           },
         ]" />
       </template>
@@ -112,6 +107,7 @@ import { session } from '/@/utils/Memory.js';
 import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 import { fileList } from '/@/api/dataAdmin/mrerdr';
 import getKeywords from '/@/views/minWidgets/Keywords.js';
+import uiTool from '/@/utils/uiTool';
 
 
 export default defineComponent({
@@ -134,7 +130,7 @@ export default defineComponent({
       reload();
     }
     // 配置下方表格
-    const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
+    const [registerTable, { setProps, reload, setSelectedRowKeys, getSelectRows }] = useTable({
       // 表格题目
       title: '文件型资源列表',
       // 分页查询请求函数
@@ -292,13 +288,21 @@ export default defineComponent({
         }
       })
     }
-    //删除
-    async function handleDelete(record) {
-      const res = await deleteService(record.serviceid);
-      if (res && res.status === '0') {
-        reload();
-        createMessage.success('删除成功！');
-      }
+
+    //删除所有选中
+    function handleDelete(record) {
+      uiTool.delModal('确定删除选中的文件资源？', async () => {
+        var ids = record?.serviceid ? record.serviceid : getSelectRows().map(i => i.serviceid).toString()
+        if (ids) {
+          const res = await deleteService(ids)
+          if (res?.status !== '-1') {
+            reload();
+            createMessage.success('删除成功！', 1)
+          } else {
+            createMessage.error('删除失败！失败原因：' + res?.message, 1)
+          }
+        }
+      })
     }
 
     return {

src/views/dataAdmin/dataAdmin/mapUpload/index.vue

@@ -5,11 +5,11 @@
         <Authority>
           <a-button type="primary" @click="handleCreate">新增地图</a-button>
         </Authority>
-        <!-- <Authority>
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
-            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
-          </Popconfirm>
-        </Authority> -->
+        <Authority>
+          <!-- <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)"> -->
+          <a-button type="primary" @click="handleDelete" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          <!-- </Popconfirm> -->
+        </Authority>
       </template>
       <!-- <template #status="{ record }">
         <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"
@@ -51,10 +51,7 @@
             color: 'error',
             ifShow: record.roleType != RoleEnum.SYS_ADMIN,
             disabled: record.status == 3 ? false : true,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDelete.bind(null, record),
-            },
+            onClick: handleDelete.bind(null, record),
           },
         ]" />
       </template>
@@ -111,6 +108,7 @@ import { mapList } from '/@/api/dataAdmin/mrerdr';
 import Moment from 'moment';
 import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 import getKeywords from '/@/views/minWidgets/Keywords.js';
+import uiTool from '/@/utils/uiTool';
 
 
 export default defineComponent({
@@ -119,7 +117,7 @@ export default defineComponent({
   setup() {
     const tagValue = ref('');
     const [registerModal, { openModal }] = useModal();
-    const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
+    const [registerTable, { setProps, reload, setSelectedRowKeys, getSelectRows }] = useTable({
       title: '地图资源列表',
       api: mapList,
       columns,
@@ -236,17 +234,21 @@ export default defineComponent({
       );
     }
 
-    const handleDelete = async (record: Recordable) => {
-      if (record?.serviceid) {
-        const res = await deleteService(record?.serviceid);
-        if (res?.status !== '-1') {
-          reload();
-          createMessage.success('删除成功！', 1);
-        } else {
-          createMessage.error('删除失败！失败原因：' + res?.message, 1);
+    //删除所有选中
+    function handleDelete(record) {
+      uiTool.delModal('确定删除选中的地图资源？', async () => {
+        var ids = record?.serviceid ? record.serviceid : getSelectRows().map(i => i.serviceid).toString()
+        if (ids) {
+          const res = await deleteService(ids)
+          if (res?.status !== '-1') {
+            reload();
+            createMessage.success('删除成功！', 1)
+          } else {
+            createMessage.error('删除失败！失败原因：' + res?.message, 1)
+          }
         }
-      }
-    };
+      })
+    }
 
     function handleSuccess() {
       openModal(false, {

src/views/dataAdmin/dataAdmin/sceneResourceUpload/index.vue

@@ -9,9 +9,9 @@
           <a-button type="primary" @click="addMethod">新增场景</a-button>
         </Authority>
         <Authority>
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
-            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
-          </Popconfirm>
+          <!-- <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)"> -->
+          <a-button type="primary" @click="handleDelete" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          <!-- </Popconfirm> -->
         </Authority>
       </template>
       <!-- 表格操作栏 -->
@@ -52,10 +52,7 @@
             color: 'error',
             ifShow: true,
             disabled: record.status == 3 ? false : true,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDelete.bind(null, record),
-            },
+            onClick: handleDelete.bind(null, record),
           },
         ]" />
       </template>
@@ -120,6 +117,7 @@ import { deleteService, queryResourceById } from '/@/api/resource/map';
 import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 import { sceneList } from '/@/api/dataAdmin/mrerdr';
 import getKeywords from '/@/views/minWidgets/Keywords.js';
+import uiTool from '/@/utils/uiTool';
 
 
 export default defineComponent({
@@ -143,7 +141,7 @@ export default defineComponent({
       reload();
     }
     // 配置下方表格
-    const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
+    const [registerTable, { setProps, reload, setSelectedRowKeys, getSelectRows }] = useTable({
       // 表格题目
       title: '场景资源列表',
       // 分页查询请求函数
@@ -274,18 +272,23 @@ export default defineComponent({
         }
       })
     }
-    //删除
-    const handleDelete = async (record: Recordable) => {
-      if (record?.serviceid) {
-        const res = await deleteService(record?.serviceid);
-        if (res?.status !== '-1') {
-          reload();
-          createMessage.success('删除成功！', 1);
-        } else {
-          createMessage.error('删除失败！失败原因：' + res?.message, 1);
+
+
+    //删除所有选中
+    function handleDelete(record) {
+      uiTool.delModal('确定删除选中的场景资源？', async () => {
+        var ids = record?.serviceid ? record.serviceid : getSelectRows().map(i => i.serviceid).toString()
+        if (ids) {
+          const res = await deleteService(ids)
+          if (res?.status !== '-1') {
+            reload();
+            createMessage.success('删除成功！', 1)
+          } else {
+            createMessage.error('删除失败！失败原因：' + res?.message, 1)
+          }
         }
-      }
-    };
+      })
+    }
 
     return {
       getKeywords,

src/views/resource/plat/item/child/ResCarModal.vue

@@ -118,10 +118,10 @@ export default defineComponent({
                                         zylx: type === 'MAP' ? '地图资源' : type === 'SCENE' ? '场景资源' : '文件资源',
                                         // zymc: item.resInfo.SERVICENAME,
                                         zymc: item.applyCarInfo.resName,
-                                        yyxt: "",
+                                        yyxt: item.systemkey,
                                         // sqdz: "",
                                         sqsj: item.applyCarInfo.createtime,
-                                        sqr: "",
+                                        sqr: item.sqrname,
                                         shzt: item.shzt,
                                         shr: "",
                                         shyj: ""
@@ -179,6 +179,8 @@ export default defineComponent({
                 setting: false,
                 fullScreen: false
             },
+            maxHeight: 400,
+            minHeight: 400,
             showIndexColumn: true,
             indexColumnProps: { fixed: 'left' },
         });