ソースを参照

Merge branch 'visu_firecontrol_01_siping_2.5d' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_firecontrol_01_siping_2.5d

JX.LI 2 年 前
コミット
17da025dd4
1 ファイル変更48 行追加48 行削除
  1. 48 48
      src/views/monitor.vue

+ 48 - 48
src/views/monitor.vue

@@ -1451,54 +1451,54 @@
         this.showTVWall(cameraParam.code, cameraParam.name);
       },
 
-      /** 预览按钮操作 */
-      preview_废弃(cameraParam) {
-        if (cameraParam.type == '1') {
-          getDahuaVideoServer().then(newResponse => {
-            console.log(newResponse)
-            this.ws.detectConnectQt().then(res => {
-              if (res) { // 连接客户端成功
-                this.alertLogin()
-                this.ws.login({
-                  loginIp: newResponse.loginIp,
-                  loginPort: newResponse.loginPort,
-                  userName: newResponse.userName,
-                  userPwd: newResponse.userPwd,
-                  token: '',
-                  https: 1
-                })
-                this.ws.on('loginState', (res) => {
-                  this.isLogin = res
-                  console.log('---res-----', res)
-                  if (res) {
-                    this.alertLoginSuccess()
-                    this.activePanel = 'key2'
-                    this.realTimeVideoDialog(cameraParam.code)
-                  } else {
-                    this.alertLoginFailed()
-                  }
-                })
-              } else { // 连接客户端失败
-                this.alertReinstall()
-              }
-            })
-          })
-        } else if (cameraParam.type == '0') {
-          let that = this
-          that.cameraVisible = true
-          getHaiKangVideoServer({
-            cameraCode: cameraParam.code
-          }).then(newResponse => {
-            that.cameraTitle = '摄像头-' + newResponse.data.cameraName
-            that.initPlugin(newResponse.data.appkey, newResponse.data.loginIp, newResponse.data.secret, newResponse
-              .data.loginPort)
-            setTimeout(function() {
-              that.playhk(newResponse.data.channelCode)
-            }, 5000)
-          })
-        }
-
-      },
+      // /** 预览按钮操作 */
+      // preview_废弃(cameraParam) {
+      //   if (cameraParam.type == '1') {
+      //     getDahuaVideoServer().then(newResponse => {
+      //       console.log(newResponse)
+      //       this.ws.detectConnectQt().then(res => {
+      //         if (res) { // 连接客户端成功
+      //           this.alertLogin()
+      //           this.ws.login({
+      //             loginIp: newResponse.loginIp,
+      //             loginPort: newResponse.loginPort,
+      //             userName: newResponse.userName,
+      //             userPwd: newResponse.userPwd,
+      //             token: '',
+      //             https: 1
+      //           })
+      //           this.ws.on('loginState', (res) => {
+      //             this.isLogin = res
+      //             console.log('---res-----', res)
+      //             if (res) {
+      //               this.alertLoginSuccess()
+      //               this.activePanel = 'key2'
+      //               this.realTimeVideoDialog(cameraParam.code)
+      //             } else {
+      //               this.alertLoginFailed()
+      //             }
+      //           })
+      //         } else { // 连接客户端失败
+      //           this.alertReinstall()
+      //         }
+      //       })
+      //     })
+      //   } else if (cameraParam.type == '0') {
+      //     let that = this
+      //     that.cameraVisible = true
+      //     getHaiKangVideoServer({
+      //       cameraCode: cameraParam.code
+      //     }).then(newResponse => {
+      //       that.cameraTitle = '摄像头-' + newResponse.data.cameraName
+      //       that.initPlugin(newResponse.data.appkey, newResponse.data.loginIp, newResponse.data.secret, newResponse
+      //         .data.loginPort)
+      //       setTimeout(function() {
+      //         that.playhk(newResponse.data.channelCode)
+      //       }, 5000)
+      //     })
+      //   }
+      //
+      // },
       realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
         if (!this.isLogin) {
           this.$Message.info('正在登陆客户端,请稍等......')