diff --git a/.env.development b/.env.development index fe20df3..21892b7 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.159:8898' +VITE_APP_BASE_API = 'http://192.168.110.180:8898' # 无人机接口地址 diff --git a/src/utils/sse.ts b/src/utils/sse.ts index aa832ab..452ff85 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -28,24 +28,25 @@ export const initSSE = (url: any) => { console.log(data.value); let label = ''; let route1 = ''; + let detailId = ''; try { if (JSON.parse(data.value)) { const obj = JSON.parse(data.value); route1 = obj.route; label = obj.message; + detailId = obj.detailId; data.value = null; } } catch (error) { label = data.value; } - console.log(route1); - console.log(label); - // if (!data.value) return; + if (!label) return; useNoticeStore().addNotice({ message: label, read: false, time: new Date().toLocaleString(), - route: route1 + route: route1, + detailId: detailId }); ElNotification({ title: '消息', diff --git a/src/views/design/prelimScheme/indexEdit.vue b/src/views/design/prelimScheme/indexEdit.vue index 6a138c8..778c307 100644 --- a/src/views/design/prelimScheme/indexEdit.vue +++ b/src/views/design/prelimScheme/indexEdit.vue @@ -39,7 +39,7 @@ ref="fileUploadRef" class="w-full" :auto-upload="false" - :data="{ projectId: currentProject.id }" + :data="{ projectId: form.projectId }" :showFileList="showFileList" :onUploadSuccess="handleUploadSuccess" :uploadUrl="`${form.id ? '/design/prelimScheme/update/' + form.id : '/design/prelimScheme/upload'}`" diff --git a/src/views/materials/usageMaterials/material/index.vue b/src/views/materials/usageMaterials/material/index.vue index 9128e37..15ec4d5 100644 --- a/src/views/materials/usageMaterials/material/index.vue +++ b/src/views/materials/usageMaterials/material/index.vue @@ -453,7 +453,7 @@ const handleDialogClose = () => { // 跳转 const jumpRouter = (row) => { router.push({ - path: `/materials/usageMaterials/materialSon`, + path: `/materials/materialSon`, query: { id: row.id, type: 'update' diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue index b4b4e12..10fffb5 100644 --- a/src/views/materials/usageMaterials/purchase/index.vue +++ b/src/views/materials/usageMaterials/purchase/index.vue @@ -1,184 +1,203 @@