Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-03-31 4a6b6d253451a14063df0659877f3d8c4ca921a5

 src/views/contingencyplan/uploadImg.vue

@@ -93,17 +93,11 @@
                    if (res.data.code==200){
                        this.fileUrl = res.data.result.fileUrl
                        this.fileName = res.data.result.fileName
                        this.fileList.push(
                            {
                                fileUrl: res.data.result.fileUrl,
                                fileName:res.data.result.fileName,
                                url:process.env.IMG_API + 'emergencyPlan/'+res.data.result.fileName
                            }
                        )
                        this.$nextTick(() => {
                            this.$emit('uploadImgSuccess', {
                                fileName: this.fileName,
                                fileUrl: this.fileUrl
                                fileUrl: this.fileUrl,
                                url:process.env.IMG_API + 'emergencyPlan/'+res.data.result.fileName
                            });
                        });
                        this.$message({