Compare commits
No commits in common. "3f0775ba065da866547d0e5563693a9f84abe706" and "234402d8d236a131182797e81aab3a1d67f79a11" have entirely different histories.
3f0775ba06
...
234402d8d2
|
@ -133,10 +133,7 @@
|
||||||
</el-tree>
|
</el-tree>
|
||||||
</div>
|
</div>
|
||||||
<div class="site-content-right">
|
<div class="site-content-right">
|
||||||
<div><span>视频监控</span></div>
|
右
|
||||||
<video-play
|
|
||||||
:key="channelCode" :channel-id="[channelCode]"
|
|
||||||
></video-play>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="site-content-people" v-show="selectedIndex == 2">
|
<div class="site-content-people" v-show="selectedIndex == 2">
|
||||||
|
@ -244,7 +241,6 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import VideoPlay from './VideoPlay'
|
|
||||||
import bus from "@/views/layout/bus";
|
import bus from "@/views/layout/bus";
|
||||||
import 'viewerjs/dist/viewer.css'
|
import 'viewerjs/dist/viewer.css'
|
||||||
import { directive as viewer } from "v-viewer"
|
import { directive as viewer } from "v-viewer"
|
||||||
|
@ -290,6 +286,13 @@ export default {
|
||||||
channelCode: returnData[0].channelCode
|
channelCode: returnData[0].channelCode
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
getCameraAllLabel().then((res) => {
|
||||||
|
this.tabList = res.data.data
|
||||||
|
});
|
||||||
|
getCameraAll().then((res) => {
|
||||||
|
this.cameraAllData = res.data
|
||||||
|
// this.addResourceTomap('cameraAll',res.data);
|
||||||
})
|
})
|
||||||
getCameraAllOrgan({parentId:'S4NbecfYB1DBH8HNULGS34'}).then((res) => {
|
getCameraAllOrgan({parentId:'S4NbecfYB1DBH8HNULGS34'}).then((res) => {
|
||||||
this.cameraTree = res.data.data
|
this.cameraTree = res.data.data
|
||||||
|
@ -340,12 +343,11 @@ export default {
|
||||||
selectedFacilitiesType:"",//设施类型
|
selectedFacilitiesType:"",//设施类型
|
||||||
facilitiesTypeOption:[{label:"设施类型",value:"1"}],
|
facilitiesTypeOption:[{label:"设施类型",value:"1"}],
|
||||||
facilitiesDataResource:[{facilitiesType:"设施类型1",address:"李沧",manageMan:"张山",telePhone:"1334650987"}],
|
facilitiesDataResource:[{facilitiesType:"设施类型1",address:"李沧",manageMan:"张山",telePhone:"1334650987"}],
|
||||||
|
cameraAllData:[],
|
||||||
cameraTreeIsShow:true,
|
cameraTreeIsShow:true,
|
||||||
cameraTreeSingle: [],
|
cameraTreeSingle: [],
|
||||||
checkStatus: '2',
|
checkStatus: '2',
|
||||||
cameraTree:[],
|
cameraTree:[],
|
||||||
channelCode:"3701222749350945",
|
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
@ -150,7 +150,7 @@ export default {
|
||||||
openVideo: false,
|
openVideo: false,
|
||||||
newImageUrl: "",
|
newImageUrl: "",
|
||||||
resourceType:"resource",
|
resourceType:"resource",
|
||||||
channelCode:"3701222749350945"
|
channelCode:["3701222749350945"]
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue