Merge branch 'master' into kdwc-web

src/api/executeThePlan.js

@@ -35,7 +35,7 @@ export function getRedis(id,type) {
 //获取喇叭列表
 export function getDeviceList(query) {
   return request({
-    url: '/speak/speaker/getDeviceList',
+    url: '/speak/speaker/getDeviceListBySub',
     method: 'get',
     params: query
   })

src/views/emergencyEvacuationBig.vue

@@ -267,7 +267,7 @@
           return
         }
         textParseUrlIps(newList,this.textarea).then(response => {
-          console.log('response',response);
+          // console.log('response',response);
           this.textarea = "";
           let newObj = {
             date:response.data.date,