diff --git a/src/renderer/src/components/upload/uploadFiles.vue b/src/renderer/src/components/upload/uploadFiles.vue index 4126b56..3e2d50c 100644 --- a/src/renderer/src/components/upload/uploadFiles.vue +++ b/src/renderer/src/components/upload/uploadFiles.vue @@ -69,9 +69,14 @@ const handleBeforeUpload = (file: File) => { // 上传成功处理 const handleSuccess = (response: any) => { - isUploading.value = false - ElMessage.success('文件上传成功') - eventBus.emit('upload', true) + if (response.code != 200) { + ElMessage.error(response.message) + isUploading.value = false + } else { + isUploading.value = false + ElMessage.success('授权成功') + eventBus.emit('upload', true) + } // 可以在这里添加成功后的其他逻辑 } 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 @@
- + @@ -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/headers/components/weather/index.vue b/src/renderer/src/views/components/headers/components/weather/index.vue index 951095c..5c33fb5 100644 --- a/src/renderer/src/views/components/headers/components/weather/index.vue +++ b/src/renderer/src/views/components/headers/components/weather/index.vue @@ -256,13 +256,13 @@ onMounted(() => { let data = JSON.parse(localStorage.getItem('shineSetting')) // weatherData.currWeather = data.currWeather //是否是实时光照 - if (!data.currWeather) { + if (!data?.currWeather) { weatherData.time = data.time } weatherData.softShadow = data.softShadow weatherData.darkness = data.darkness weatherData.speed = data.speed - data.wearther.forEach((item, index) => { + data?.wearther.forEach((item, index) => { list[index].status = item.status }) // list = data.wearther 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 }) diff --git a/src/renderer/src/views/components/tree/index.vue b/src/renderer/src/views/components/tree/index.vue index 6bd7cf4..bf29cd1 100644 --- a/src/renderer/src/views/components/tree/index.vue +++ b/src/renderer/src/views/components/tree/index.vue @@ -177,7 +177,7 @@