merge

src/views/home/component/pro_left.vue

@@ -46,24 +46,12 @@
 </template>
 
 <script>
-<
-<
-<
-<
-<
-<< Updated upstream
-           import mainButton from "@/components/main-button.vue";
-import proRelation from "@/views/home/component/pro_relation.vue";
-
-export default {
-  name: "pro_left",
-  components: {mainButton, proRelation},
-=== === =
 import mainButton from '@/components/main-button.vue'
+import proRelation from '@/views/home/component/pro_relation.vue'
 
 export default {
   name: 'pro_left',
-  components: {mainButton},
+  components: { mainButton, proRelation },
   props: {
     data: Object,
     code: {
@@ -73,7 +61,7 @@ export default {
   },
   watch: {
     data: {
-      handler(val) {
+      handler (val) {
         if (val) {
           this.getDic('project-situation')
         }
@@ -81,7 +69,7 @@ export default {
       immediate: false
     },
     code: {
-      handler(val) {
+      handler (val) {
         if (val) {
           this.getDic(val)
         }
@@ -89,7 +77,7 @@ export default {
       immediate: false
     }
   },
-  data() {
+  data () {
     return {
       height: 0,
       dicList: [],
@@ -101,12 +89,12 @@ export default {
       resultList: []
     }
   },
-  created() {
+  created () {
     this.getDic(this.code)
   },
   methods: {
-    getDic(code) {
-      this.$api.common.dicList({code}).then(res => {
+    getDic (code) {
+      this.$api.common.dicList({ code }).then(res => {
         if (res.code === 200) {
           if (code === 'project-situation') {
             this.dicList = res.data
@@ -122,10 +110,10 @@ export default {
         }
       })
     },
-    proInfo() {
+    proInfo () {
       this.$emit('typeChange')
     },
-    record() {
+    record () {
       this.$emit('typeChange1')
     }
   }