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 () => {

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

@@ -17,7 +17,7 @@
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -183,5 +183,7 @@ getTagsOption()
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>