Browse Source

Merge branch 'master' of http://221.182.8.141:11666/sujunlin/xld-gis-admin

tengmingxue 1 year ago
parent
commit
cd7a5df727

+ 1 - 0
src/views/resource/examine/index.vue

@@ -271,6 +271,7 @@ export default defineComponent({
      * 审核
      */
     async function handleEdit(record: Recordable) {
+      appStore.setRouterPushAuditFlag(false)
       ischect.value = true;
       if(!record?.BUSSID) return;
       const res = (await queryResourceById(record?.SERVICEID)) as any;

+ 2 - 0
src/views/resource/plat/item/child/Search.vue

@@ -33,6 +33,7 @@ import { getAllTags } from '/@/api/sys/tag';
 import eventBus from '/@/utils/eventBus';
 import { useAdminStoreOut } from '/@/store/modules/admin';
 import { watch } from 'vue';
+import { useModal } from '/@/components/Modal';
 
 export default defineComponent({
     name: 'Search',
@@ -86,6 +87,7 @@ export default defineComponent({
             eventBus.emit('platListCenter', { sqkzt: statusValue.value, filterValue: keyWord.value, type: props.type, isPage: true });
         }
 
+        const [registerModal, { openModal }] = useModal();
         const visible = ref(false);
         const showModal = () => {
             visible.value = true;