合并分支 'thy' 到 'master'

src/components/roleDispose/roleDispose.vue

@@ -5,26 +5,24 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-              <!-- <span>查询：</span> -->
-              <el-select v-model="input3" size="medium" @change="mySelect" placeholder="请选择查询条件">
-               <el-option
-      label="关键技术"
-      value="technologyName">
-    </el-option>
-               <el-option
-      label="关键字"
-      value="target">
-    </el-option>
-
+              <!-- <span>关键技术：</span> -->
+              <el-select v-model="input3" size="medium" placeholder="请选择关键技术">
                <el-option
-      label="范围"
-      value="suffix">
+               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" @change="search" placeholder="请输入关键技术"></el-input>
+              <el-input v-model="input2" size="medium"  placeholder="请输入关键字"></el-input>
+            </span>
+            <span class="searchVal" style="margin-left:30px;">
+              <!-- <span>查询：</span> -->
+              <el-input v-model="input1" size="medium" placeholder="请输入范围"></el-input>
             </span>
             <span class="button searchBtn" @click="search">搜索</span>
             <span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span>
@@ -95,6 +93,7 @@ export default {
           searchKey:'',
           input3:'',
             input2: '',
+            input1: '',
             suffix:'',
             target:'',
             tableData: [],
@@ -104,6 +103,7 @@ export default {
             components: '',
             myPage: 1,
             detailData: {},
+            keyNameList:[],
             modalName: ''
         }
     },
@@ -115,26 +115,37 @@ export default {
             this.$message.error('数据请求失败！');
         })
         this.search();
+        this.keyName()
     },
     methods: {
         // 搜索
-        mySelect(val){
-          this.searchKey =val
+        keyName(){
+          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('数据请求失败！');
+            })
        
         },
         search () {
           let obj = {
-                technologyName:'',
-                target:'',
-                suffix:'',
+                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
-         }
+        
+  //           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)