提交修改

src/views/assessingTarget/basicTarget.vue

@@ -172,12 +172,7 @@ export default {
         quota1: "",
         quota2: "",
       },
-<<<<<<< HEAD
       class:{type:0}
-=======
-      updateData: [],
-      showDep: false,
->>>>>>> 279c27f4171c882a90872dbed98b219a3783bec7
     };
   },
   created() {

src/views/assessingTarget/tab.vue

@@ -17,7 +17,6 @@ export default {
     methods: {
       getType (params) {
         this.type = params
-        // console.log(params)
         this.$emit("get-type", {type: params});
       }
     }
@@ -26,7 +25,7 @@ export default {
 
 <style scoped>
 .el-radio-button, /deep/ .el-radio-button__inner{
-    height:45px;
+    height:40px;
     width:120px;
     line-height:23px;
     font-size:16px;