Merge remote-tracking branch 'origin/develop' into develop

src/views/home/component/folder_info.vue

@@ -252,7 +252,10 @@ export default {
     },
     getDict() {
       this.$api.project
-        .folderType({ stageId: this.projectStageId, projectId: this.projectId })
+        .folderType({
+          stageId: this.projectStageId,
+          projectId: this.$route.query.id
+        })
         .then(res => {
           if (res.code === 200) {
             this.folderType = res.data

src/views/home/component/params/params1.vue

@@ -518,8 +518,8 @@ export default {
     },
     changeIndustry(res) {
       const tmp = this.industryList.find(ele => ele.dictKey === res)
-      console.log(tmp)
       this.form.dict_key = Number.parseInt(tmp.dictKey)
+      delete this.form.dict_value
     }
   }
 }