Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/views/components/propertyBox/ScreenShot.vue

@@ -102,6 +102,7 @@ const closeCallBack = (e) => {
   progressVal.value = 0
   scale.value = 1
   modify.value = false
+  eventBus.emit('closeScreenShot', false)
 }
 onBeforeUnmount(() => {
   closeCallBack('')

src/renderer/src/views/home/index.vue

@@ -163,10 +163,13 @@ if (!localStorage.getItem('defaultLabelStyle')) {
 }
 //移除天气设置
 localStorage.removeItem('weartherSetting')
-
+eventBus.on('closeScreenShot', () => {
+  if (currentComponent.value?.__name == 'ScreenShot') {
+    currentComponent.value = undefined
+  }
+})
 eventBus.on('openDialog', async (sourceType: any, id: any) => {
   if (dynamicComponentRef.value?.name == 'ScreenShotHD') {
-    console.log('关闭截图')
     ElMessageBox.confirm('此操作将会打开新弹窗关闭高清截图功能, 是否继续?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',