From 6e74185e9cc9559d1057666bfa6d47c48ae0aefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E5=A4=A7=E8=83=86?= <1101282782@qq.com>
Date: Fri, 21 Nov 2025 17:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E5=8C=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9D=A2=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setPup/components/modelManage.vue         |  2 +-
 .../headers/components/setPup/setPup.vue      | 18 +++++++++++++++-
 .../components/propertyBox/addDevice.vue      | 14 ++++++++++++-
 .../components/propertyBox/addMaterials.vue   | 21 +++++++++++++++++--
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
index aa81697..5114c21 100644
--- a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue
@@ -285,7 +285,7 @@ const addType = () => {
 eventBus.on('settingPop', (data) => {
   if (data) {
     //关闭弹框时更新模型列表
-    // getModelList()
+    getModelList()
 
     // getModelListByType(showImageRow.modelTypeId)
     showImageRow = null
diff --git a/src/renderer/src/views/components/headers/components/setPup/setPup.vue b/src/renderer/src/views/components/headers/components/setPup/setPup.vue
index 3a908af..f6cf39b 100644
--- a/src/renderer/src/views/components/headers/components/setPup/setPup.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/setPup.vue
@@ -87,7 +87,7 @@
         </div>
       </template>
       <div class="set_detail">
-        <el-tabs :tab-position="tabPosition" v-model="activeName">
+        <el-tabs :tab-position="tabPosition" :before-leave="changeTab" v-model="activeName">
           <el-tab-pane :label="t('system.authorize')" name="authorize">
             <authorize></authorize>
           </el-tab-pane>
@@ -133,6 +133,8 @@ import graphLabelManage from './components/graphLabelManage.vue'
 import photoManage from './components/photoManage.vue'
 
 import { useI18n } from 'vue-i18n'
+
+const eventBus: any = inject('bus')
 const { t } = useI18n()
 const tabPosition = ref('left')
 const activeName = ref('authorize')
@@ -145,6 +147,20 @@ const open = (data) => {
     activeName.value = 'authorize'
   }
 }
+
+const changeTab = (x, j) => {
+  switch (j) {
+    case 'device':
+      eventBus.emit('closeAddDevice')
+      break
+    case 'materials':
+      eventBus.emit('closeAddMaterial')
+      break
+    default:
+      break
+  }
+  console.log(x, j, 'activeName.value')
+}
 const close = () => {
   isShowPup.value = false
 }
diff --git a/src/renderer/src/views/components/propertyBox/addDevice.vue b/src/renderer/src/views/components/propertyBox/addDevice.vue
index be42de8..912f866 100644
--- a/src/renderer/src/views/components/propertyBox/addDevice.vue
+++ b/src/renderer/src/views/components/propertyBox/addDevice.vue
@@ -169,7 +169,8 @@ var submitProtal = () => {
     }
   })
 }
-eventBus.on('openAddDevice', (params) => {
+
+let func = (params) => {
   addTitle.value = params.title
   if (addTitle.value != '添加设备') {
     addForm.value = params.data
@@ -185,6 +186,17 @@ eventBus.on('openAddDevice', (params) => {
     }
   }
   baseDialog.value?.open()
+}
+let closeFunc = () => {
+  baseDialog.value?.close()
+}
+onMounted(() => {
+  eventBus.on('openAddDevice', func)
+  eventBus.on('closeAddDevice', closeFunc)
+})
+onUnmounted(() => {
+  eventBus.off('openAddDevice', func)
+  eventBus.off('closeAddDevice', closeFunc)
 })
 const open = () => {
   baseDialog.value?.open()
diff --git a/src/renderer/src/views/components/propertyBox/addMaterials.vue b/src/renderer/src/views/components/propertyBox/addMaterials.vue
index 0b9970a..64ad2a2 100644
--- a/src/renderer/src/views/components/propertyBox/addMaterials.vue
+++ b/src/renderer/src/views/components/propertyBox/addMaterials.vue
@@ -92,7 +92,7 @@ var submitProtal = () => {
     }
   })
 }
-eventBus.on('openAddMaterial', (params) => {
+let func = (params) => {
   console.log(params, 'iuiuuiuiu')
   addTitle.value = params.title == 'add' ? '添加物资' : '修改物资'
   if (params.title == 'edit') {
@@ -106,15 +106,32 @@ eventBus.on('openAddMaterial', (params) => {
     }
   }
   baseDialog.value?.open()
+}
+
+let closeFunc = () => {
+  baseDialog.value?.close()
+}
+onMounted(() => {
+  eventBus.on('openAddMaterial', func)
+  eventBus.on('closeAddMaterial', closeFunc)
 })
+onUnmounted(() => {
+  eventBus.off('openAddMaterial', func)
+  eventBus.off('closeAddMaterial', closeFunc)
+})
+
 const open = () => {
   baseDialog.value?.open()
 }
+const close = () => {
+  baseDialog.value?.close()
+}
 const confirm = () => {
   baseDialog.value?.close()
 }
 defineExpose({
-  open
+  open,
+  close
 })
 </script>