Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

src/views/project-management/implementation/phase.vue

@@ -120,11 +120,6 @@ const handleSubmit = (instance) => {
 
 const init = async () => {
   const {msg, code,data} = await getProjectCheckProcess(route.query.projectId)
-  ElNotification({
-    title: '提示',
-    message: msg,
-    type: code === 1000 ? 'success' : 'error'
-  })
   processDiagramViewer.value = false
   if (code === 1000) {
     deploymentId.value = data.deploymentId
@@ -138,6 +133,12 @@ const init = async () => {
     nextTick(() => {
       processDiagramViewer.value = true
     })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:'error'
+    })
   }
 }
 onMounted(async () => {