瀏覽代碼

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

wang_xy 2 年之前
父節點
當前提交
ad4d3f8e60
共有 5 個文件被更改,包括 13 次插入13 次删除
  1. 1 1
      src/components/TVWall.vue
  2. 3 3
      src/components/eventLocation.vue
  3. 3 3
      src/views/eventdetailsdialog.vue
  4. 3 3
      src/views/firespread.vue
  5. 3 3
      src/views/monitor.vue

+ 1 - 1
src/components/TVWall.vue

@@ -346,7 +346,7 @@ export default {
                 // userName: 'system',
                 // userName: 'system',
                 // userPwd: 'Admin@123',
                 // userPwd: 'Admin@123',
                 token: '',
                 token: '',
-                https: 0
+                https: 1
               })
               })
               this.ws.on('loginState', (res) => {
               this.ws.on('loginState', (res) => {
                 this.isLogin = res
                 this.isLogin = res

+ 3 - 3
src/components/eventLocation.vue

@@ -547,7 +547,7 @@ export default {
     },
     },
     /** 预览按钮操作 */
     /** 预览按钮操作 */
     preview(cameraParam) {
     preview(cameraParam) {
-      if (cameraParam.type == '大华') {
+      if (cameraParam.type == '1') {
         getDahuaVideoServer().then(newResponse => {
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
           this.ws.detectConnectQt().then(res => {
@@ -559,7 +559,7 @@ export default {
                 userName: newResponse.userName,
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 userPwd: newResponse.userPwd,
                 token: '',
                 token: '',
-                https: 0
+                https: 1
               })
               })
               this.ws.on('loginState', (res) => {
               this.ws.on('loginState', (res) => {
                 this.isLogin = res
                 this.isLogin = res
@@ -577,7 +577,7 @@ export default {
             }
             }
           })
           })
         })
         })
-      } else if (cameraParam.type == '海康') {
+      } else if (cameraParam.type == '0') {
         let that = this
         let that = this
         that.cameraVisible = true
         that.cameraVisible = true
         getHaiKangVideoServer({ cameraCode: cameraParam.code }).then(newResponse => {
         getHaiKangVideoServer({ cameraCode: cameraParam.code }).then(newResponse => {

+ 3 - 3
src/views/eventdetailsdialog.vue

@@ -2091,7 +2091,7 @@ export default {
     },
     },
     /** 预览按钮操作 */
     /** 预览按钮操作 */
     preview(cameraParam) {
     preview(cameraParam) {
-      if(cameraParam.type=='大华'){
+      if(cameraParam.type=='1'){
         getDahuaVideoServer().then(newResponse => {
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
           this.ws.detectConnectQt().then(res => {
@@ -2103,7 +2103,7 @@ export default {
                 userName: newResponse.userName,
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 userPwd: newResponse.userPwd,
                 token: '',
                 token: '',
-                https: 0
+                https: 1
               })
               })
               this.ws.on('loginState', (res) => {
               this.ws.on('loginState', (res) => {
                 this.isLogin = res
                 this.isLogin = res
@@ -2121,7 +2121,7 @@ export default {
             }
             }
           })
           })
         })
         })
-      }else if(cameraParam.type=='海康'){
+      }else if(cameraParam.type=='0'){
         let that = this
         let that = this
         that.cameraVisible = true
         that.cameraVisible = true
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {

+ 3 - 3
src/views/firespread.vue

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

+ 3 - 3
src/views/monitor.vue

@@ -658,7 +658,7 @@ export default {
     },
     },
     /** 预览按钮操作 */
     /** 预览按钮操作 */
     preview(cameraParam) {
     preview(cameraParam) {
-      if(cameraParam.type=='大华'){
+      if(cameraParam.type=='1'){
         getDahuaVideoServer().then(newResponse => {
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
           this.ws.detectConnectQt().then(res => {
@@ -670,7 +670,7 @@ export default {
                 userName: newResponse.userName,
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 userPwd: newResponse.userPwd,
                 token: '',
                 token: '',
-                https: 0
+                https: 1
               })
               })
               this.ws.on('loginState', (res) => {
               this.ws.on('loginState', (res) => {
                 this.isLogin = res
                 this.isLogin = res
@@ -688,7 +688,7 @@ export default {
             }
             }
           })
           })
         })
         })
-      }else if(cameraParam.type=='海康'){
+      }else if(cameraParam.type=='0'){
         let that = this
         let that = this
         that.cameraVisible = true
         that.cameraVisible = true
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
         getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {