Add - 更换企业列表接口为selectEnterpriseAllList && 更换查询设备数量接口为selectCreamedAndDeviceCount

src/api/forest.js

@@ -378,7 +378,7 @@ export function eventHandling(id,eventCode) {
 }
   export function enterpriseList(param) {
     return request({
-      url: '/center-unobtrusive/unobtrusive/enterprise/list',
+      url: '/center-unobtrusive/unobtrusive/enterprise/selectEnterpriseAllList',
       method: 'get',
       params:param
     })

src/api/monitor.js

@@ -156,3 +156,11 @@ export function selectRecorderByDeptId(param) {
       data:param
     })
 }
+
+// 查询摄像头、传感器、执法设备数量
+export function selectCreamedAndDeviceCount() {
+  return request({
+    url: '/center-unobtrusive/unobtrusive/enterprise/selectCreamedAndDeviceCount',
+    method: 'get'
+  })
+}

src/components/Monitor_StatusAware/index.vue

@@ -176,8 +176,8 @@ export default {
       }
       this.queryParams.pageSize = pageSize;
       this.queryParams.pageNum = pageNum;
-      enterpriseList(this.queryParams).then(res => {
-        this.companyList = res.rows
+      enterpriseList({...this.queryParams ,deptId:Cookies.get("deptId")}).then(res => {
+        this.companyList = res.data
         this.totalAllCompany = res.total
       })
     },

src/views/eventdetailsdialog.vue

@@ -4427,7 +4427,6 @@ function cbIntegrationCallBack(oData) {
     border-left: none !important;
   }
   .el-radio-button:nth-child(1){
-    width: 70px
   }
 }
 </style>

src/views/firespread.vue

@@ -3402,7 +3402,6 @@ function cbIntegrationCallBack(oData) {
     border-left: none !important;
   }
   .el-radio-button:nth-child(1){
-    width: 70px
   }
 }
 </style>

src/views/forest.vue

@@ -603,8 +603,8 @@
         }
         this.queryParams.pageSize = pageSize;
         this.queryParams.pageNum = pageNum;
-        enterpriseList(this.queryParams).then(res => {
-          this.companyList = res.rows
+        enterpriseList({...this.queryParams,deptId:Cookies.get("deptId")}).then(res => {
+          this.companyList = res.data
           this.totalAllCompany = res.total
         })
       },

src/views/monitor.vue

@@ -129,6 +129,7 @@ import {
   selectKeyAreaList,
   getRegionalFlag,
   getCamerasByDeptId,
+  selectCreamedAndDeviceCount,
   selectByCameraId,
   selectByDeviceId,
   selectByBroadcastId, selectRecorderByDeptId
@@ -189,6 +190,13 @@ export default {
       // this.getMonitorDeviceAndDataLists();
       // this.getDlblistBydeptIds();
       // this.selectRecorder();
+      // 查询摄像头、传感器、执法设备数量
+      selectCreamedAndDeviceCount().then(res => {
+        if(res.data){
+          this.sheNum = res.data.creamedCount || 0
+          this.sensorNum = res.data.deviceCount || 0
+        }
+      })
       this.selectDeviceType(-1);
       // this.showTVWall();
     }, 2000)
@@ -559,11 +567,10 @@ export default {
       this.localMark = 'She'
       this.deptId = Cookies.get("deptId")
       let that = this;
-      selectRecorderByDeptId({deptId: this.deptId, cameraUse: "1,2,3,4,5,7", type: 18}).then((res) => {
+      selectRecorderByDeptId({deptId: this.deptId, cameraUse: "1,2,3,4,5,6,7", type: 18}).then((res) => {
         that.cameraMarkersList = [];
         that.visuForestCloudCameraBOList = res.data;
         that.visuForestCloudCameraBOListSearch = res.data;
-        that.sheNum = res.data.length;
         if(initial != -1){
           if (
             res.data != null && res.data.length > 0