临时提交

web_src/src/components/common/channelDataTypeSelect.vue

@@ -1,39 +1,27 @@
 <template>
-  <div id="channelDataTypeSelect" >
-    <el-select size="mini"  @change="$emit('change', $event.target.value)" v-model="dataType" placeholder="请选择"
-               default-first-option>
-      <el-option label="全部" value=""></el-option>
-      <el-option
-        v-for="item in dataTypeArray"
-        :key="item.key"
-        :label="item.key"
-        :value="item.value">
-      </el-option>
-    </el-select>
-  </div>
+  <el-select size="mini"  @change="change" v-model="dataType" placeholder="请选择"
+             default-first-option>
+    <el-option label="全部" value=""></el-option>
+    <el-option
+      v-for="item in dataTypeArray"
+      :key="item.key"
+      :label="item.key"
+      :value="item.value">
+    </el-option>
+  </el-select>
 </template>
 
 <script>
 
 export default {
   name: "channelDataTypeSelect",
-  model: {
-    prop: 'dataType',
-    event: 'change'
-  },
-  props: {
-    dataType: {
-      type: String,
-      default: ''
-    }
-  },
-  components: {},
+  props: ['dataType','change'],
   created() {
     this.init()
   },
   data() {
     return {
-      dataTypeArray: []
+      dataTypeArray: [],
     };
   },
   methods: {
@@ -51,13 +39,3 @@ export default {
   },
 };
 </script>
-<style>
-.channel-form {
-  display: grid;
-  background-color: #FFFFFF;
-  padding: 1rem 2rem 0 2rem;
-  grid-template-columns: 1fr 1fr 1fr;
-  gap: 1rem;
-}
-
-</style>

web_src/src/components/dialog/GbChannelSelect.vue

@@ -23,7 +23,7 @@
             <el-option label="离线" value="false"></el-option>
           </el-select>
           类型:
-          <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" @change="getChannelList" v-model="channelType"></channelDataTypeSelect>
+          <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
           <el-button size="mini" :loading="getChannelListLoading"
                      @click="getChannelList()">刷新</el-button>
           <el-button type="primary" size="mini" style="float: right" @click="onSubmit">确 定</el-button>

web_src/src/components/dialog/linkChannelRecord.vue

@@ -22,7 +22,7 @@
                   <el-option label="离线" value="false"></el-option>
                 </el-select>
                 类型:
-                <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" @change="search" v-model="channelType"></channelDataTypeSelect>
+                <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="search" :dataType="channelType"></channelDataTypeSelect>
                 <el-button v-if="hasLink !=='true'" size="mini" type="primary" @click="add()">
                   添加
                 </el-button>

web_src/src/components/dialog/shareChannelAdd.vue

@@ -20,7 +20,7 @@
               <el-option label="离线" value="false"></el-option>
             </el-select>
             类型:
-            <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" @change="search" v-model="channelType"></channelDataTypeSelect>
+            <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="search" :dataType="channelType"></channelDataTypeSelect>
             <el-button v-if="hasShare !=='true'" size="mini" type="primary" @click="add()">
               添加
             </el-button>

web_src/src/components/group.vue

@@ -28,7 +28,7 @@
                 <el-option label="离线" value="false"></el-option>
               </el-select>
               类型:
-              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" @change="getChannelList" v-model="channelType"></channelDataTypeSelect>
+              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
               <el-button size="mini" type="primary" @click="add()">
                 添加通道
               </el-button>

web_src/src/components/region.vue

@@ -28,7 +28,7 @@
                 <el-option label="离线" value="false"></el-option>
               </el-select>
               类型:
-              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" @change="getChannelList" v-model="channelType"></channelDataTypeSelect>
+              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
               <el-button size="mini" type="primary" @click="add()">
                 添加通道
               </el-button>