Merge branch 'kdwc-xcx' of http://192.168.1.43:3000/git/sass-lab-xcxc into kdwc-xcx

pages/emergencyEvacuationBig.vue

@@ -185,7 +185,7 @@
 <script>
     import { config } from '@/api/request/config.js'
     import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,laboratoryInfo,
-	getCameraByFloor,nanhuGetStartList,wenchangGetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
+	getCameraByFloor,nanhuGetStartList,wenchangGetStartList,lineEvacuateTow,treeselectByUser,getBuilding,getDeviceListBySub} from '@/api/index.js'
     export default {
         data() {
             return {
@@ -887,11 +887,12 @@
 			},
 			async getDeviceList(){
 				let obj ={
+					subId:this.itemData.subjectId,
 					floorId:this.floorId,
 					page:1,
 					pageSize:100,
 				};
-				const {data} = await getDeviceList(obj)
+				const {data} = await getDeviceListBySub(obj)
 				if(data.code == 200){
 					for(let i=0;i<data.data.length;i++){
 						data.data[i].type = false;