合并分支 'crs' 到 'master'

src/components/roleDispose/roleDispose.vue

@@ -6,23 +6,21 @@
           <p class="search">
             <span class="searchVal">
               <!-- <span>关键技术：</span> -->
-              <el-select v-model="input3" size="medium" placeholder="请选择关键技术">
-               <el-option
-               v-for="item in keyNameList"
-               :key="item.id"
-      :label="item.technologyName"
-      :value="item.technologyName">
-    </el-option>
-     
+              <el-select v-model="input3" size="medium" placeholder="请选择关键技术" @change="search" clearable>
+                 <el-option
+                   v-for="item in keyNameList"
+                   :key="item.id"
+                   :label="item.technologyName"
+                   :value="item.technologyName">
+                 </el-option>
               </el-select>
             </span>
             <span class="searchVal">
               <span>查询：</span>
-              <el-input v-model="input2" size="medium"  placeholder="请输入关键字"></el-input>
+              <el-input v-model="input2" size="medium"  placeholder="请输入关键字" @change="search"></el-input>
             </span>
             <span class="searchVal" style="margin-left:30px;">
-              <!-- <span>查询：</span> -->
-              <el-input v-model="input1" size="medium" placeholder="请输入范围"></el-input>
+              <el-input v-model="input1" size="medium" placeholder="请输入范围" @change="search"></el-input>
             </span>
             <span class="button searchBtn" @click="search">搜索</span>
             <span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span>
@@ -90,8 +88,8 @@ export default {
     name: 'roleDispose',
     data () {
         return {
-          searchKey:'',
-          input3:'',
+            searchKey:'',
+            input3:'',
             input2: '',
             input1: '',
             suffix:'',
@@ -120,33 +118,24 @@ export default {
     methods: {
         // 搜索
         keyName(){
-          let val = {
+            let val = {
                 'technologyName': '',
             }
             this.$server.getAllPageList(this.myPage,this.pageSize,val).then(res=>{
                 console.log(res.data)
                 this.keyNameList = res.data.rows;
-             
+
             }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err)
             })
-       
+
         },
         search () {
-          let obj = {
+            let obj = {
                 technologyName:this.input3,
                 target:this.input2,
                 suffix:this.input1,
             }
-        
-  //           if(this.searchKey == 'suffix'){
-  //             obj.suffix = this.input2
-  //        }else if (this.searchKey == 'technologyName'){
-  //  obj.technologyName = this.input2
-  //        }else if (this.searchKey == 'target'){
-  //  obj.target = this.input2
-  //        }
-            
             this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
                 console.log(res)
                 this.tableData = res.data.rows;
@@ -250,7 +239,6 @@ export default {
     line-height: 34px;
   }
   .roleDispose .content .searchVal:nth-child(2)>span{
-    width: 150px;
     margin-left: 20px;
     text-align: right;
   }