记录仪

src/components/mixins/map-data1.js

@@ -574,6 +574,7 @@ export default {
          * @param {页面类型} type
          */
         addMarker(lnglats, pageType, type) {
+            console.log(lnglats, pageType, type)
             window.jMap.Locate.clearLocate();
             let icon = "";
             let arr = []

src/views/comprehensive-disposal.vue

@@ -291,18 +291,20 @@
         <div class="rightBottom" v-if="!(checkedArray.checkedData[0] == 1 && stores.$state.mapSpotId)">
           <h4>4G图传</h4>
           <el-row class="monitor-list">
-            <el-col :span="11" class="list">
+            <div class="list">
               <el-select v-model="zfjly1" placeholder="请选择4G图传" class="videoSelect">
                 <el-option v-for="item in selectVideoData" :key="item.url" :label="item.name" :value="item.url"> </el-option>
               </el-select>
+              <img src="@/assets/img/home/video.jpg" alt="" v-if="!zfjly1">
               <iframe class="hlsVideo monitor-height" :src="zfjly1" allowfullscreen="true"></iframe>
-            </el-col>
-            <el-col :span="11" class="list" :offset="2">
+            </div>
+            <div class="list" :offset="2">
               <el-select v-model="zfjly2" placeholder="请选择4G图传" class="videoSelect">
                 <el-option v-for="item in selectVideoData" :key="item.url" :label="item.name" :value="item.url"> </el-option>
               </el-select>
+              <img src="@/assets/img/home/video.jpg" alt="" v-if="!zfjly2">
               <iframe class="hlsVideo monitor-height" :src="zfjly2" allowfullscreen="true"></iframe>
-            </el-col>
+            </div>
           </el-row>
         </div>
 
@@ -533,7 +535,8 @@ export default {
           "Content-Type": "application/json;charset=UTF-8",
         },
         method: "get",
-        url: "http://32.0.15.107:8080/video-api/kiop-gateway-core/4G/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022",
+        // url: "http://32.0.15.107:8080/video-api/kiop-gateway-core/4G/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022",
+        url: "http://32.0.15.107:8080/video-api/kiop-gateway-core/tysbs/device/ext?apikey=643e6591-a489-4648-ba35-c15c39c64022&f_in_civilCode=31021019,31020414&pageNo=0&pageSize=10000",
       }).then((res) => {
 
           let arr = [];
@@ -550,12 +553,14 @@ export default {
                   gisY: data[i]?.latitude ? data[i]?.latitude : 0,
                   type: "监控画面",
                   gbid: data[i].gbid,
-                  url: "http://10.107.31.215:50080/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" + data[i].gbid + "&nmediaid=121",
+                //   url: "http://10.107.31.215:50080/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" + data[i].gbid + "&nmediaid=121",
+                      url: "http://10.107.31.215:50080/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" + data[i].gbid,
                 };
                 arr.push(num);
               }
             }
             for (let i = 0; i < arr.length; i++) {
+                // console.log(arr[i])
               if (arr[i].name.indexOf("单兵") > -1 || arr[i].name.indexOf("无人机") > -1 || arr[i].name.indexOf("布控球") > -1) {
                 zfjly.push(arr[i]);
               }
@@ -1372,11 +1377,21 @@ export default {
           border: 1px solid #3a7e8e;
           margin-top: 0.2rem;
           position: relative;
+          width:48%;
+            box-sizing: border-box;
           .videoSelect {
             position: absolute;
             width: 100%;
             border: none !important;
           }
+          img{
+                width:100%;
+                height:250px;
+                overflow: hidden;
+            }
+        }
+        .list:nth-child(2){
+                margin-left:4%;
         }
         .hlsVideo {
           width: 100%;
@@ -1384,6 +1399,7 @@ export default {
       }
       iframe {
         border: none;
+        width:100%;
       }
     }
 

src/views/enforcement-dynamic.vue

@@ -445,8 +445,8 @@
                 </div>
                 <div class="rightBox3">
                     <h4>执法记录仪</h4>
-                    <el-row class="monitor-list">
-                        <el-col  :span="11" class="list">
+                    <el-row class="monitor-list" >
+                        <div class="list">
                             <el-select
                                 v-model="zfjly1"
                                 placeholder="请选择执法记录仪"
@@ -460,13 +460,15 @@
                                 >
                                 </el-option>
                             </el-select>
+                            <img src="@/assets/img/home/video.jpg" alt="" v-if="!zfjly1">
+                            
                             <iframe
                                 class="hlsVideo monitor-height"
                                 :src="zfjly1"
                                 allowfullscreen="true"
                             ></iframe>
-                        </el-col>
-                        <el-col  :span="11" class="list" :offset="2">
+                        </div>
+                        <div class="list" :offset="2">
                             <el-select
                                 v-model="zfjly2"
                                 placeholder="请选择执法记录仪"
@@ -480,12 +482,13 @@
                                 >
                                 </el-option>
                             </el-select>
+                             <img src="@/assets/img/home/video.jpg" alt="" v-if="!zfjly2">
                             <iframe
                                 class="hlsVideo monitor-height"
                                 :src="zfjly2"
                                 allowfullscreen="true"
                             ></iframe>
-                        </el-col>
+                        </div>
                     </el-row>
                 </div>
             </div>
@@ -823,7 +826,6 @@ export default {
                                     "http://10.107.31.215:50080/dispatch-ms/#/conference/single_url?ipc_live=1&key=643e6591-a489-4648-ba35-c15c39c64022&gbids=" +
                                     data[i].gbid,
                             };
-                            console.log(1111,num.name,data[i].gbid)
                             arr.push(num);
                         }
                     }
@@ -837,6 +839,7 @@ export default {
                         }
                     }
                     this.selectVideoData = zfjly;
+                    console.log(234, this.selectVideoData)
                     if (arr.length > 0 && id) {
                         this.addMarker(arr, "enforcement-dynamic","执法记录仪");
                     }
@@ -1368,14 +1371,25 @@ export default {
         > .list {
             border: 1px solid #3a7e8e;
             position: relative;
+            width:48%;
+            box-sizing: border-box;
             .videoSelect {
                 position: absolute;
                 width: 100%;
             }
+            img{
+                width:100%;
+                height:250px;
+                overflow: hidden;
+            }
+        }
+        .list:nth-child(2){
+                margin-left:4%;
         }
     }
     iframe {
         border: none;
+        width:100%;
     }
 }
 .treeMap {