事件流程确认后不可有误报、重复；短连接遮罩层；摄像头厂家判断

src/api/event.js

@@ -1,10 +1,13 @@
 import request from '@/utils/request'
 
 //获取附近事件
-export function getNearEvent(longitude,latitude) {
+export function getNearEvent(longitude,latitude,day,loading) {
   return request({
-    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude,
+    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude+"&day="+day,
     method: 'get',
+    headers: {
+      loading: loading
+    },
   })
 }
 //获取附近摄像头

src/views/eventdetailsdialog.vue

@@ -194,32 +194,32 @@
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
                                     签收
                                   </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
                                 <div>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-phone" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('ld',false)">
@@ -2133,7 +2133,7 @@ export default {
     },
     /** 预览按钮操作 */
     preview(cameraParam) {
-      if(cameraParam.type=='大华'){
+      if(cameraParam.type=='1'){
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
@@ -2163,7 +2163,7 @@ export default {
             }
           })
         })
-      }else if(cameraParam.type=='海康'){
+      }else if(cameraParam.type=='0'){
         let that = this
         that.cameraVisible = true
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {

src/views/firespread.vue

@@ -2081,7 +2081,7 @@
       },
       /** 预览按钮操作 */
       preview(cameraParam) {
-        if(cameraParam.type=='大华'){
+        if(cameraParam.type=='1'){
           getDahuaVideoServer().then(newResponse => {
             console.log(newResponse)
             this.ws.detectConnectQt().then(res => {
@@ -2111,7 +2111,7 @@
               }
             })
           })
-        }else if(cameraParam.type=='海康'){
+        }else if(cameraParam.type=='0'){
           let that = this
           that.cameraVisible = true
           getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {

src/views/monitor.vue

@@ -485,8 +485,7 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型：' + res.data.visuForestCloudCameraBOList[i]
-                .cameraFactory + '</h4>' +
+              '                  <h4>摄像头类型：' + (res.data.visuForestCloudCameraBOList[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +
@@ -578,8 +577,7 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型：' + res.data[i]
-                .cameraFactory + '</h4>' +
+              '                  <h4>摄像头类型：' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +
@@ -658,7 +656,7 @@ export default {
     },
     /** 预览按钮操作 */
     preview(cameraParam) {
-      if(cameraParam.type=='大华'){
+      if(cameraParam.type=='1'){
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
@@ -688,7 +686,7 @@ export default {
             }
           })
         })
-      }else if(cameraParam.type=='海康'){
+      }else if(cameraParam.type=='0'){
         let that = this
         that.cameraVisible = true
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {