Merge branch 'dev' into trp_dev

src/components/content/tunnelScene/editEquComp/editDialog.vue

@@ -14,6 +14,9 @@
         <p>传感器类型</p>
         <el-select
           v-model="equipmentSetting.equipmentType"
+          :fit-input-width="true"
+          filterable
+          clearable
           placeholder="请选择设备类型"
         >
           <el-option
@@ -28,6 +31,9 @@
         <p>设备选择</p>
         <el-select
           v-model="equipmentSetting.chooseEquipment"
+          :fit-input-width="true"
+          filterable
+          clearable
           placeholder="请选择设备类型"
         >
           <el-option
@@ -285,7 +291,4 @@ const equipment = {
     }
   }
 }
-:deep(.el-select-dropdown__wrap) {
-  background: greenyellow !important;
-}
 </style>