Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	src/views/vehicleType/modal/oneType.vue

src/views/vehicleType/modal/oneType.vue

@@ -7,7 +7,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="车型名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入车型名称" ></el-input>
+            <el-input v-model="form.name" placeholder="请输入车型名称"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -96,8 +96,10 @@
       <el-row>
         <el-col :span="8" v-for="(item, index) in labelList" :key="item.id">
           <el-form-item>
-            <span style="width: 150px;text-align:right;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 10px;">{{item.parent.name}}</span>
-            <el-input v-model="item.selectChild" readonly icon="edit" @click="editConfig(item)" style="width: 70%;"></el-input>
+            <span
+              style="width: 150px;text-align:right;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 10px;">{{item.parent.name}}</span>
+            <el-input v-model="item.selectChild" readonly icon="edit" @click="editConfig(item)"
+                      style="width: 70%;"></el-input>
             <!--<el-select v-model="item.childNameLists" style="width: 80%" v-if="item.parent.isMore==1" multiple placeholder="请选择" @change = "selectItem">-->
             <!--<el-option-->
             <!--v-for="iitem in item.children"-->
@@ -134,7 +136,9 @@
       </el-row>
 
       <el-form-item label="房车参数">
-        <el-button size="small" class="el-button el-button--primary" type="button" icon="plus" @click="addModelParam()">添加</el-button>
+        <el-button size="small" class="el-button el-button--primary" type="button" icon="plus" @click="addModelParam()">
+          添加
+        </el-button>
         <el-col v-for="(item, index) in form.modelParam" :key="index">
           <el-form-item label="参数名称" style="margin: 10px 5px;">
             <el-input style="width: 30%;" v-model="item.key"></el-input>
@@ -924,11 +928,4 @@ import UE from '../../modal/Ueditor';//百度ue富文本
     border-bottom: 1px solid #999;
     padding: 3px;
   }
-
-  .cx{
-    margin-top: 0px;
-    margin-bottom: 0px;
-    height: 180px;
-  }
-
 </style>