Merge remote-tracking branch 'origin/master'

src/assets/styles/element-ui.scss

@@ -55,6 +55,10 @@
 .el-input--small .el-input__icon {
   color: #AFAFAF;
 }
+.el-input.is-disabled .el-input__inner{
+  color: #333;
+  background-color: #f4f4f4;
+}
 
 .el-form-item__label {
   font-size: 14px;

src/views/equipment-management/use-management/use-management.vue

@@ -7,6 +7,7 @@
           v-model.trim="queryParams.searchText"
           placeholder="请输入设备名称/设备ID"
           clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item prop="status">