Merge remote-tracking branch 'origin/master'

src/components/screenDisplay.vue

@@ -456,36 +456,41 @@ import AMapLoader from "@amap/amap-jsapi-loader";
         </div>
         <div class="thirdLeftLayer_one">
           <div class="titleStyleTwo"><p>电气柜监视</p></div>
-          <div class="carousel_content">
+          <div class="carousel_content" v-if="alarmsImgList.length > 0">
             <el-carousel>
               <el-carousel-item v-for="(item,index) in alarmsImgList" :key="index">
+                <div class="eventTime_class">报警时间:{{item.eventTime}}</div>
                 <img :src="item.imageUrl" class="carousel_img">
               </el-carousel-item>
             </el-carousel>
           </div>
-<!--          <div class="noVideoData">暂无监控信息......</div>-->
+          <div v-else class="noVideoData">暂无电气柜信息......</div>
         </div>
-        <div v-loading="loading" class="thirdLeftLayer_one">
+        <div class="thirdLeftLayer_two">
+          <div v-loading="loading">
             <div class="title_row">
               <div class="titleStyleTwoVideo"><p>循环泵听诊</p></div>
               <div class="moreInfo" v-show="hasAudio"  @click="PreviousAudio()">上一个</div>
               <div class="moreInfo" v-show="hasAudio" @click="nextAudio()">下一个</div>
-<!--            <div class="moreInfo" v-show="hasVideo" @click="moreVideo()">更多》</div>-->
+              <!--            <div class="moreInfo" v-show="hasVideo" @click="moreVideo()">更多》</div>-->
             </div>
+            <div v-if="showAudio === true">
             <div>
               <div class="audio_title">{{audioTitle}}</div>
               <div ref="waveform" style="width: 800px; height: 140px;"></div>
               <!-- 时间轴容器 -->
               <div ref="timeline" style="width: 100%; height: 25px;"></div>
             </div>
-          <div class="details-item" v-if="showAudio === true">
+            <div class="details-item">
               <span>音频:</span>
               <audio ref="audioPlayer" controls></audio>
               <!--          <button @click="playAudio">获取音频</button>-->
               <button @click="playAudioRegion">播放区域</button>
               <button @click="stopPlayAudioRegion">暂停播放区域</button>
             </div>
-<!--          <div class="noVideoData">暂无监控信息......</div>-->
+            </div>
+            <div v-else class="noVideoData">暂无循环泵听诊信息......</div>
+          </div>
         </div>
       </div>
       <div class="thirdRightLayer">
@@ -515,18 +520,22 @@ import AMapLoader from "@amap/amap-jsapi-loader";
         </div>
         <div class="thirdLeftLayer_one">
           <div class="titleStyleTwo"><p>管道光纤测漏温度曲线</p></div>
-          <div class="secondLeftLayerP2" id="secondLeftLayerP2"></div>
+          <div class="fourRow">
+            <div class="fourRow_title2">{{stationName}}</div>
+          </div>
+          <div v-if="temStatisList.length > 0" class="secondLeftLayerP2" id="secondLeftLayerP2"></div>
+          <div v-else class="noVideoData">暂无管道光纤测漏温度信息......</div>
         </div>
         <div class="thirdLeftLayer_one">
           <div class="titleStyleTwo"><p>灭火器仪表监视</p></div>
-          <div class="carousel_content">
+          <div v-if="fireList.length > 0" class="carousel_content">
             <el-carousel>
               <el-carousel-item v-for="(item,index) in fireList" :key="index">
                 <img :src="item.picUrl" class="carousel_img">
               </el-carousel-item>
             </el-carousel>
           </div>
-<!--          <div class="noVideoData">暂无监控信息......</div>-->
+          <div v-else class="noVideoData">暂无灭火器仪表信息......</div>
         </div>
       </div>
       <div class="bottomLayerTwo">
@@ -3708,7 +3717,7 @@ export default defineComponent({
         grid: {
           left: 30,
           right: 20,
-          top: 10,
+          top: 20,
           bottom: 35,
         },
         // series: [
@@ -4263,6 +4272,16 @@ export default defineComponent({
   display: flex;
   align-items: center;
   font-size: 16px;
+  button{
+    margin-left: 10px;
+  }
+}
+.eventTime_class{
+  position: absolute;
+  padding: 10px;
+  font-size: 17px;
+  font-weight: bold;
+  color: black;
 }
 .carousel_content{
   ::v-deep .el-carousel__container{
@@ -4634,8 +4653,16 @@ export default defineComponent({
   margin-top: 18%;
   font-size: 20px;
 }
+.thirdLeftLayer_two{
+  overflow-x: auto;
+  width: 100%;
+  margin-bottom: 11px;
+  height: 32%;
+  border: rgba(129, 210, 230, 0.5) solid 1px;
+  //padding: 0 0 0 10px;
+  background: linear-gradient(318deg, rgba(29, 70, 128, 0.8) 0%, rgba(13, 23, 76, 0.8) 100%);
+}
 .thirdLeftLayer_one{
-  overflow: auto;
   width: 100%;
   margin-bottom: 11px;
   height: 32%;
@@ -4702,6 +4729,14 @@ export default defineComponent({
   font-size: 17px;
   font-weight: bold;
 }
+.fourRow_title2{
+  margin-top: 10px;
+  margin-left: 20px;
+  color: white;
+  width: 30%;
+  font-size: 17px;
+  font-weight: bold;
+}
 .fourRow_label{
   color: white;
   width: 30%;
@@ -4779,7 +4814,7 @@ export default defineComponent({
 }
 .gis_content .secondLeftLayerP2 {
   width: 100%;
-  height: 80%;
+  height: 70%;
 }
 .gis_content .rightLayer {
   position: absolute;