merge fix

src/views/home/component/pro_left.vue

@@ -111,8 +111,7 @@ export default {
         if (res.code === 200) {
           if (code === 'project-situation') {
             this.dicList = res.data
-            console.log(this.projectStage)
-            const local = this.dicList.filter(e => e.dictKey === this.projectStage + '')
+            const local = this.dicList.filter(e => e.dictKey === this.projectStage)
             if (local.length > 0) {
               this.currentSituation = local[0]
             }
@@ -142,7 +141,7 @@ export default {
       this.$emit('typeChange1')
     },
     result (item) {
-      const data = { id: this.data.id, project_stage: item }
+      const data = { id: this.data.id, project_stage: Number.parseInt(item) }
       this.$api.project.proUpdate(data).then(res => {
         if (res.code === 200) {
           this.$message.success(res.msg)