zc

.env.production

@@ -5,11 +5,11 @@ NODE_ENV=production
 VUE_APP_TITLE=贵州大学实验室安全智慧化管控中心
 
 # 外网接口基础地址
-VUE_APP_BASE_API = 'lab.zjznai.com/gzdxlabSystem'
+VUE_APP_BASE_API = 'gzu.zjznai.com/api'
 # VUE_APP_BASE_API = 'lab.zjznai.com/appTest'
 
 # 内网接口基础地址
-VUE_APP_BASE_LOCAL_API = '192.168.8.2/api'
+VUE_APP_BASE_LOCAL_API = '172.21.0.2/api'
 # VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 
 # 接口超时时间（毫秒）

src/components/LabStats/videoStats.vue

@@ -5,10 +5,10 @@
     <div class="panel-title">实验室视频监控</div>
     <div class="video-content">
       <!--<webRTC v-if="webRtcType"></webRTC>-->
-      <!--<videoForMod v-for="(item,index) in modList" :key="index"-->
-                   <!--:deviceNo="item.deviceNo"></videoForMod>-->
-      <mpegts-video style="display: inline-block;margin:0 5px 5px 0;"
-                    :videoProps="item" v-for="(item,index) in demoList" :key="index"></mpegts-video>
+      <videoForMod v-for="(item,index) in modList" :key="index"
+                   :deviceNo="item.deviceNo"></videoForMod>
+      <!--<mpegts-video style="display: inline-block;margin:0 5px 5px 0;"-->
+                    <!--:videoProps="item" v-for="(item,index) in demoList" :key="index"></mpegts-video>-->
     </div>
   </div>
 </template>

src/components/VideoMonitor/VideoGrid.vue

@@ -10,8 +10,8 @@
     </div>
     <div class="panel-content">
       <div class="grid-container" >
-        <!--<H5PlayerVideo v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>-->
-        <mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>
+        <H5PlayerVideo v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
+        <!--<mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>-->
         <!-- <div
           v-for="(video, idx) in videoList"
           :key="video.id"

src/components/alarmWindow/AlertModal.vue

@@ -55,9 +55,9 @@
                 <!--<i class="el-icon-video-camera"></i>-->
                 <!--<span>实时监控画面</span>-->
               <!--</div>-->
-              <!--<H5PlayerVideo style="margin:10px 0 0 12px;" v-if="videoData" :videoProps="videoData"></H5PlayerVideo>-->
+              <H5PlayerVideo style="margin:10px 0 0 12px;" v-if="videoData" :videoProps="videoData"></H5PlayerVideo>
               <p v-if="!videoData" style="line-height:210px;text-align: center;color:#fff;font-size:16px;">该实验室无监控</p>
-              <mpegts-video v-if="videoData" style="display: inline-block" :videoProps="videoData"></mpegts-video>
+              <!--<mpegts-video v-if="videoData" style="display: inline-block" :videoProps="videoData"></mpegts-video>-->
             </div>
           </div>
         </div>

src/components/alarmWindow/emergency.vue

@@ -155,9 +155,9 @@
         <!--<div class="evac-floor-lbl">楼道 {{ alarmData.floor || '1' }}层</div>-->
         <!--<div class="evac-cam-slot">实时视频监控</div>-->
         <div class="video-for-box" v-if="videoType">
-          <!--<H5PlayerVideo style="margin:10px 0 0 10px;"-->
-                         <!--v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>-->
-          <mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>
+          <H5PlayerVideo style="margin:10px 0 0 10px;"
+                         v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
+          <!--<mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>-->
         </div>
         <p class="null-p" v-if="!videoType">暂无数据</p>
       </div>