Merge branch 'develop'

project/src/components/assembly/screen/channel.vue

@@ -2,7 +2,7 @@
   <div class="common-screen-item">
     <label class="common-screen-label" v-if="title && title != ''"
       :style="labelWidth ? 'width:auto;padding-left:30px' : ''">{{ title }}</label>
-    <div :style="width ? 'width:' + width : ''"
+    <!-- <div :style="width ? 'width:' + width : ''"
       :class="['common-screen-self-box', 'common-input-select', (valueCon && valueCon.val) && clearable ? 'common-input-select-hover' : '']">
       <div :class="['common-screen-self-con', (!valueCon || !valueCon.val) ? 'common-screen-self-placeholder' : '']">
         <div class="common-screen-self-con-div">
@@ -17,7 +17,20 @@
         <el-option v-for="item in options" :key="item.key" :label="item.val" :value="item.key">
         </el-option>
       </el-select>
-    </div>
+    </div> -->
+
+    <el-select
+      class="select-cls"
+      v-model="value"
+      :style="{width: width || '210px'}"
+      size="small"
+      :placeholder="placeholderVal || '请选择'"
+      :clearable="clearable"
+      filterable
+      @change="change"
+    >
+      <el-option v-for="item in options" :key="item.key" :label="item.val" :value="item.key" />
+    </el-select>
   </div>
 </template>
 <script>
@@ -296,4 +309,21 @@ export default {
   padding: 0 !important;
   text-align: center;
 }
+.select-cls {
+  /deep/ &.el-select .el-input.is-focus .el-input__inner,
+  /deep/ &.el-select .el-input__inner:focus {
+    border-color: #DCDFE6;
+  }
+  /deep/ .el-input__suffix {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border: 1px solid #DCDFE6;
+    right: 0;
+    width: 30px;
+    background-color: #F1F1F1;
+    .el-input__icon {
+      color: #909399;
+    }
+  }
+}
 </style>