王通 преди 2 години
родител
ревизия
909ce6ad6b
променени са 2 файла, в които са добавени 24 реда и са изтрити 3 реда
  1. 3 3
      src/views/eventdetailsdialog.vue
  2. 21 0
      src/views/monitor.vue

+ 3 - 3
src/views/eventdetailsdialog.vue

@@ -1516,7 +1516,7 @@ export default {
       this.sendDeptName = null
       this.sendUserFegin = []
       this.sendEventType = null
-      this.sendHuoZaiBanJing = null
+      this.sendHuoZaiBanJing = 0
       this.sendGuanLianYuAn = null
       this.longitude = null
       this.latitude = null
@@ -1539,7 +1539,7 @@ export default {
       this.sendDeptName = null
       this.sendUserFegin = []
       this.sendEventType = null
-      this.sendHuoZaiBanJing = null
+      this.sendHuoZaiBanJing = 0
       this.sendGuanLianYuAn = null
       this.sendTaskTitle = null
       this.sendTaskSource = null
@@ -1838,7 +1838,7 @@ export default {
               return
             }
             if (eventStatus == 'qs') {
-              if (that.sendHuoZaiBanJing == '' || that.sendHuoZaiBanJing == null) {
+              if (that.sendHuoZaiBanJing == '' || that.sendHuoZaiBanJing == 0) {
                 that.$message.error(`请输入火灾半径!`)
                 return
               }

+ 21 - 0
src/views/monitor.vue

@@ -108,6 +108,14 @@
               <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
             </div>
             <div class="i-list-con h-43">
+              <el-input
+                v-model="rightDeptName"
+                placeholder="请输入摄像头名称"
+                clearable
+                size="small"
+                prefix-icon="el-icon-search"
+                style="margin-bottom: 20px"
+              />
               <div class="d-l-con" v-for="(item,index) in visuForestCloudCameraBOList"
                    :class="{on:listCurrentIndex2 == index}"
                    v-on:click="dropLocation(item.latitude,item.longitude,index)">
@@ -240,6 +248,9 @@ export default {
       },
       visuForestCloudMapDeviceBOList: [],
       visuForestCloudCameraBOList: [],
+      //摄像头名称
+      rightDeptName: undefined,
+      visuForestCloudCameraBOListSearch:[],
       cameraMarkersList: [],
       sourceData: [],
       keyAreaList: [],//重点区域
@@ -262,6 +273,14 @@ export default {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val)
+    },
+    rightDeptName(val){
+      this.visuForestCloudCameraBOListSearch=[];
+      for (let i in this.visuForestCloudCameraBOList) {
+        if(this.visuForestCloudCameraBOList[i].cameraName.indexOf(val) != -1){
+          this.visuForestCloudCameraBOListSearch.push(this.visuForestCloudCameraBOList[i]);
+        }
+      }
     }
   },
   methods: {
@@ -402,6 +421,7 @@ export default {
         }
 
         that.visuForestCloudCameraBOList = res.data.visuForestCloudCameraBOList
+        that.visuForestCloudCameraBOListSearch = res.data.visuForestCloudCameraBOListSearch
         // this.cameraChat()
         if (res.data.visuForestCloudCameraBOList != null && res.data.visuForestCloudCameraBOList
           .length > 0) {
@@ -502,6 +522,7 @@ export default {
       selectCameraByDeptId(depId).then(res => {
         //根据设备类型查看列表
         that.visuForestCloudCameraBOList = res.data
+        that.visuForestCloudCameraBOListSearch = res.data
         if (res.data != null && res.data.length > 0) {
           for (let i = 0; i < res.data.length; i++) {
             let markersMap = {