|
@@ -139,17 +139,17 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- import {
|
|
|
- selectDeviceType,
|
|
|
- selectCameraByDeptId,
|
|
|
- getSensorListByDeptId,
|
|
|
- getDlblistBydeptId,
|
|
|
- selectKeyAreaList,
|
|
|
- getRegionalFlag,
|
|
|
- notCoverPlaces,
|
|
|
- getCamerasByDeptId,
|
|
|
- getMonitorDeviceAndDataList
|
|
|
- } from '@/api/monitor'
|
|
|
+import {
|
|
|
+ selectDeviceType,
|
|
|
+ selectCameraByDeptId,
|
|
|
+ getSensorListByDeptId,
|
|
|
+ getDlblistBydeptId,
|
|
|
+ selectKeyAreaList,
|
|
|
+ getRegionalFlag,
|
|
|
+ notCoverPlaces,
|
|
|
+ getCamerasByDeptId,
|
|
|
+ getMonitorDeviceAndDataList, getDlblistBydeptId_direct, selectDeviceType_direct
|
|
|
+} from '@/api/monitor'
|
|
|
import {
|
|
|
treeselect
|
|
|
} from '@/api/system/dept'
|
|
@@ -497,7 +497,7 @@
|
|
|
getDlblistBydeptId() {
|
|
|
let that = this;
|
|
|
let markersList = [];
|
|
|
- getDlblistBydeptId(that.deptId).then(function(res) {
|
|
|
+ getDlblistBydeptId_direct(that.deptId).then(function(res) {
|
|
|
// that.loudspeakerNum = res.data.length
|
|
|
that.visuForestCloudCameraBOListSearch = []
|
|
|
that.tempList = []
|
|
@@ -589,15 +589,13 @@
|
|
|
getDlblistBydeptIds() {
|
|
|
let that = this;
|
|
|
|
|
|
- getDlblistBydeptId(that.deptId).then(function(res) {
|
|
|
+ getDlblistBydeptId_direct(that.deptId).then(function(res) {
|
|
|
that.loudspeakerNum = res.data.length
|
|
|
})
|
|
|
.catch(function(error) {
|
|
|
console.error(error);
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
-
|
|
|
getMonitorDeviceAndDataList() {
|
|
|
let list = []
|
|
|
let markersList = [];
|
|
@@ -938,7 +936,6 @@
|
|
|
getSensorListByDeptId() {
|
|
|
let that = this;
|
|
|
let markersList = [];
|
|
|
-
|
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
|
that.visuForestCloudCameraBOListSearch = []
|
|
|
// that.sensorNum = res.data.length
|
|
@@ -1117,6 +1114,7 @@
|
|
|
//获取左侧动态感知设备
|
|
|
let that = this
|
|
|
selectDeviceType(that.deptId).then(res => {
|
|
|
+ // selectDeviceType_direct({deptId:that.deptId,type:7}).then(res => {
|
|
|
that.cameraMarkersList = []
|
|
|
that.tempList = []
|
|
|
that.visuForestCloudMapDeviceBOList = res.data.visuForestCloudMapDeviceBOList
|