|
@@ -223,6 +223,7 @@ import {
|
|
getRegionalFlag,
|
|
getRegionalFlag,
|
|
getCamerasByDeptId,
|
|
getCamerasByDeptId,
|
|
getMonitorDeviceAndDataList,
|
|
getMonitorDeviceAndDataList,
|
|
|
|
+ selectDeviceType_direct,
|
|
getCamerasByDeptId_direct,
|
|
getCamerasByDeptId_direct,
|
|
getDlblistBydeptId_direct,
|
|
getDlblistBydeptId_direct,
|
|
selectKeyAreaList_direct,
|
|
selectKeyAreaList_direct,
|
|
@@ -279,7 +280,7 @@ export default {
|
|
this.getMonitorDeviceAndDataLists(this.deptId);
|
|
this.getMonitorDeviceAndDataLists(this.deptId);
|
|
this.getDlblistBydeptIds(this.deptId);
|
|
this.getDlblistBydeptIds(this.deptId);
|
|
// this.chuanSet();
|
|
// this.chuanSet();
|
|
- this.selectDeviceType(-1);
|
|
|
|
|
|
+ this.selectDeviceType('',-1)
|
|
}, 2000)
|
|
}, 2000)
|
|
|
|
|
|
this.bottomMenuList(); //获取底部公共组件消息和任务
|
|
this.bottomMenuList(); //获取底部公共组件消息和任务
|
|
@@ -291,7 +292,7 @@ export default {
|
|
cgqData: [],
|
|
cgqData: [],
|
|
cgqTimer:null,
|
|
cgqTimer:null,
|
|
deptName: undefined,
|
|
deptName: undefined,
|
|
- deptId: "",
|
|
|
|
|
|
+ deptId: null,
|
|
// 部门树选项
|
|
// 部门树选项
|
|
deptOptions: undefined,
|
|
deptOptions: undefined,
|
|
defaultProps: {
|
|
defaultProps: {
|
|
@@ -898,7 +899,7 @@ export default {
|
|
clearInterval(this.cgqTimer);
|
|
clearInterval(this.cgqTimer);
|
|
this.deptId=Cookies.get("deptId")
|
|
this.deptId=Cookies.get("deptId")
|
|
this.placeholderMsg = "请输入摄像头名称";
|
|
this.placeholderMsg = "请输入摄像头名称";
|
|
- this.selectDeviceType();
|
|
|
|
|
|
+ this.selectDeviceType('',-1);
|
|
this.jkListIcon = 'sj-icon-jkzx'
|
|
this.jkListIcon = 'sj-icon-jkzx'
|
|
},
|
|
},
|
|
laClick() {
|
|
laClick() {
|
|
@@ -1219,7 +1220,7 @@ export default {
|
|
selectDeviceType() {
|
|
selectDeviceType() {
|
|
//获取左侧动态感知设备
|
|
//获取左侧动态感知设备
|
|
let that = this;
|
|
let that = this;
|
|
- selectDeviceType(that.deptId).then((res) => {
|
|
|
|
|
|
+ selectDeviceType_direct({deptId:that.deptId,type:4}).then(res => {
|
|
that.cameraMarkersList = [];
|
|
that.cameraMarkersList = [];
|
|
that.visuForestCloudMapDeviceBOList =
|
|
that.visuForestCloudMapDeviceBOList =
|
|
res.data.visuForestCloudMapDeviceBOList;
|
|
res.data.visuForestCloudMapDeviceBOList;
|