合并分支 'thy' 到 'master'

src/components/roleDispose/roleDispose.vue

@@ -118,17 +118,11 @@ export default {
     methods: {
         // 搜索
         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 => {
-                console.log(err)
-            })
-
+           this.$server.getAllList().then(res => {
+                console.log(res);
+                this.keyNameList = res.data;
+            });
+       
         },
         search () {
             let obj = {