Przeglądaj źródła

根据不同厂家访问摄像头找不同插件问题

wang_xy 2 lat temu
rodzic
commit
aef3aeeac2

+ 2 - 7
src/components/TVWall.vue

@@ -3,10 +3,6 @@
     <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
 	  <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
-	  	<!--&lt;!&ndash; <div class="this-title">-->
-	  		<!--<span>林场</span>-->
-	  		<!--<span>45</span>-->
-	  	<!--</div> &ndash;&gt;-->
 	  	<!--<div class="i-list-con" style="height: 46vh; overflow-y: scroll;">-->
 	  		<!--<span v-for="(item,index) in cameraList" :key="index">-->
 	  			<!--<div class="d-l-con" @click="playhk(item.channelCode)">-->
@@ -251,8 +247,8 @@ export default {
         }],
       crtPosX: 0,
       crtPosY: 0,
-      crtWidth: 1150,
-      crtHeight: 700,
+      crtWidth: 1148,
+      crtHeight: 650,
       domId: 'dom1',
       mixedVideoDisplayMode: 2,
       isShowTipe: true,
@@ -368,7 +364,6 @@ export default {
     },
 
     create(tvListJson) { // 调用创建控件接口
-      debugger
       let _this = this
       const params = [
         {

+ 2 - 2
src/components/eventLocation.vue

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

+ 2 - 2
src/views/eventdetailsdialog.vue

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

+ 2 - 2
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 => {

+ 4 - 6
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 => {