合并冲突

src/views/education/item-component.vue

@@ -46,7 +46,7 @@
                 <el-table-column label="操作" fixed="right" align="center" min-width="200">
                     <template slot-scope="scope">
                         <el-button type="primary" size="small" @click="editComponentList(scope.row)">编辑</el-button>
-                        <el-button type="primary" size="small" disabled>启用</el-button>
+                        <el-button type="primary" size="small" @click="enable(scope.row)">启用</el-button>
                         <el-button type="primary" size="small">禁用</el-button>
                         <el-button type="primary" size="small">删除</el-button>
                     </template>
@@ -113,12 +113,7 @@ export default {
     methods: {
         // 列表查询
         search() {
-            let req = {
-                name: '',
-                pageNo: 1,
-                pageSize: 15
-            }
-            vm.GET('/portalComponent/queryPortalComponent',req).then((res) => {
+            vm.GET('/portalComponent/queryPortalComponent',vm.searchParam).then((res) => {
                 if( res.code == '000000' ) {
                     vm.tableData = res.data.queryList
                     vm.totalRows = res.data.total