|
|
@@ -66,7 +66,7 @@
|
|
|
<view class="site"><img src="@/images/icon_14.png">{{address}}</view>
|
|
|
</view>
|
|
|
<!-- 视频监控-选择疏散路径 -->
|
|
|
- <view class="monito">
|
|
|
+ <!-- <view class="monito">
|
|
|
<view class="monito_li">
|
|
|
视频监控
|
|
|
<view class="monito_li_r monito_li_r_text" @click="goVideo()">查看监控<img src="@/images/icon_04.png"></view>
|
|
|
@@ -83,7 +83,7 @@
|
|
|
</picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
<!-- 滚动部分 -->
|
|
|
<!-- <view class="evacuation-scroll-box">
|
|
|
<view :class="videoIndex == index?'scroll-box-color':''"
|
|
|
@@ -264,23 +264,11 @@
|
|
|
}
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
- this.treeselectByUser();
|
|
|
+ this.treeselectByUser(option);
|
|
|
this.getAppExitLine();
|
|
|
getApp().watch(this.getMqttLineData,'lineData');
|
|
|
let self = this;
|
|
|
//判断入口(执行疏散)
|
|
|
- if(option.item){
|
|
|
- let item = JSON.parse(decodeURIComponent(option.item));
|
|
|
- this.subId = item.subId;
|
|
|
- this.buildingId = item.buildingId;
|
|
|
- this.deptId = item.buildingId;
|
|
|
- this.title = item.title;
|
|
|
- this.type = item.type;
|
|
|
- this.evacuateTwo();
|
|
|
- }else{
|
|
|
- //判断入口(首页按钮)
|
|
|
- this.getRedis();
|
|
|
- }
|
|
|
},
|
|
|
onShow(){
|
|
|
// this.lablayout();
|
|
|
@@ -288,7 +276,7 @@
|
|
|
},
|
|
|
methods: {
|
|
|
//根据账户信息查询学院楼栋数据
|
|
|
- async treeselectByUser(){
|
|
|
+ async treeselectByUser(option){
|
|
|
const {data} = await treeselectByUser()
|
|
|
let list = [];
|
|
|
for(let i=0;i<data.data.length;i++){
|
|
|
@@ -316,6 +304,23 @@
|
|
|
this.$set(this,'subName',"");
|
|
|
this.$set(this,'subId',"");
|
|
|
// this.getBuilding(this.buildingId);
|
|
|
+ if(option.item){
|
|
|
+ let item = JSON.parse(decodeURIComponent(option.item));
|
|
|
+ console.log("item",item)
|
|
|
+ this.subId = item.subId;
|
|
|
+ this.subName = item.subjectName;
|
|
|
+ this.address = item.address
|
|
|
+ this.buildingId = item.buildingId;
|
|
|
+ this.deptId = item.buildingId;
|
|
|
+ this.floorId = item.floorId;
|
|
|
+ this.title = item.title;
|
|
|
+ this.type = item.type;
|
|
|
+ this.lablayout(this.buildingId,this.floorId);
|
|
|
+ this.evacuateTwo();
|
|
|
+ }else{
|
|
|
+ //判断入口(首页按钮)
|
|
|
+ this.getRedis();
|
|
|
+ }
|
|
|
},
|
|
|
//根据账户信息查询学院楼栋数据
|
|
|
async getBuilding(buildingId){
|
|
|
@@ -421,8 +426,8 @@
|
|
|
const {data} = await getCameraByFloor({floorId:this.floorId})
|
|
|
if(data.code == 200){
|
|
|
if(data.data[0]){
|
|
|
- //this.nanhuGetStartList(data.data);
|
|
|
- this.itemData.hardwareNUM=data.data.join(',')
|
|
|
+ this.itemData.hardwareNUM=data.data.join(',')
|
|
|
+ this.wenchangGetStartList(data.data);
|
|
|
// this.startUrl(response.data);
|
|
|
}
|
|
|
}
|
|
|
@@ -664,8 +669,9 @@
|
|
|
this.subName = data.data.subName;
|
|
|
this.address = data.data.deptName+'-'+data.data.buildName+'-'+data.data.floorName
|
|
|
// this.lablayout(data.data.buildId,data.data.floorId);
|
|
|
+ this.lablayout(this.buildingId,this.floorId);
|
|
|
this.evacuate();
|
|
|
- this.getBuilding(this.buildingId);
|
|
|
+ // this.getBuilding(this.buildingId);
|
|
|
}else{
|
|
|
this.pageType = 1;
|
|
|
this.isEvacuate=true;
|
|
|
@@ -840,10 +846,10 @@
|
|
|
}
|
|
|
this.lightList = newList;
|
|
|
console.log('灯数据改变',this.lightList);
|
|
|
-
|
|
|
this.pageType = 2;
|
|
|
this.$forceUpdate();
|
|
|
this.getDeviceList();
|
|
|
+ this.getCameraByFloor();
|
|
|
},
|
|
|
async getDeviceList(){
|
|
|
let obj ={
|
|
|
@@ -944,12 +950,11 @@
|
|
|
border-radius:20rpx;
|
|
|
padding:20rpx 0 30rpx;
|
|
|
.evacuation-title-box{
|
|
|
- height:150rpx;
|
|
|
+ // height:150rpx;
|
|
|
//border-bottom:1rpx solid #dedede;
|
|
|
background: #FFFFFF;
|
|
|
border-radius: 20rpx;
|
|
|
- padding-left:22rpx;
|
|
|
- padding-top:34rpx;
|
|
|
+ padding:34rpx 22rpx;
|
|
|
box-sizing :border-box;
|
|
|
.evacuation-title-name-box{
|
|
|
font-size: 30rpx;
|
dedsudiyu