From d6d48bff1117dd7e3b982e3307dec32b71808b9b Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 May 2023 09:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue | 29 ++++++++++++++++++++------
 src/views/realTimeMonitor/index.vue    | 17 +++++++++++----
 src/views/realTimeSearch/index.vue     |  4 ++++
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 3c708a5..b1eaa67 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -81,12 +81,29 @@
             class="smallnoPic"
             v-else-if="item.path.indexOf('videos') !== -1"
           >
-            <video
-              width="100%"
-              height="100%"
-              :src="item.path"
-              controls="controls"
-            ></video>
+            <img :src="item.thumb" />
+            <p class="timeInfo">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="拍照时间"
+                placement="top-start"
+              >
+                <span>{{ $moment(item.photoTime).format("HH:mm:ss") }}</span>
+              </el-tooltip>
+
+              (
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="图片上传时间"
+                placement="top-start"
+              >
+                <span> {{ $moment(item.recvTime).format("HH:mm:ss") }}</span>
+              </el-tooltip>
+              )
+              <span>--通道{{ item.channelId }}</span>
+            </p>
           </div>
           <div class="smallnoPic" v-else>
             <img :src="item.path" />
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index ad2b82e..13ee62f 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -85,8 +85,8 @@
                 :label="item.label"
                 :value="item.value"
               >
-              </el-option> 
-            </el-select>-->
+              </el-option>
+            </el-select> -->
           </div>
 
           <div class="setTimebtn">
@@ -338,6 +338,14 @@ export default {
           }
         })
         .catch((err) => {
+          this.loading = false;
+          console.log("没有绑定通道");
+          this.terminalPhoto = [
+            {
+              path: this.nopicPath,
+            },
+          ];
+          console.log(this.terminalPhoto);
           console.log(err); //代码错误、请求失败捕获
         });
     },
@@ -377,12 +385,13 @@ export default {
     //切换通道
     changeChannelId(val) {
       console.log(val);
+
       let channelObj = {};
       channelObj = this.channelOption.find(function (i) {
         return i.value;
       });
       console.log(channelObj);
-      this.getTerminalPhotoList(val, this.dateValue, channelObj.termid);
+      this.getTerminalPhotoList([val], this.dateValue, channelObj.termid);
     },
 
     //设置时间表
@@ -430,7 +439,7 @@ export default {
     },
     //获取GPS位置
     handleShowGPS() {
-      getTermGPSJoggle({ termId: this.channelId })
+      getTermGPSJoggle({ termid: this.channelId })
         .then((res) => {
           console.log(res);
           this.$alert(
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 01e24b4..ab74849 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -5,6 +5,7 @@
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
           <el-form-item label="电压名称">
             <el-select v-model="formdata.dyid" @change="getSearchxl">
+              <el-option key="" label="全部" value=""></el-option>
               <el-option
                 v-for="item in dyOptions"
                 :key="item.id"
@@ -15,6 +16,7 @@
           </el-form-item>
           <el-form-item label="线路名称">
             <el-select v-model="formdata.lineid" @change="getSearchgt">
+              <el-option key="" label="全部" value=""></el-option>
               <el-option
                 v-for="item in xlOptions"
                 :key="item.id"
@@ -25,6 +27,7 @@
           </el-form-item>
           <el-form-item label="杆塔名称">
             <el-select v-model="formdata.towerid" @change="getSearchtd">
+              <el-option key="" label="全部" value=""></el-option>
               <el-option
                 v-for="item in gtOptions"
                 :key="item.id"
@@ -35,6 +38,7 @@
           </el-form-item>
           <el-form-item label="通道">
             <el-select v-model="formdata.channelid">
+              <el-option key="" label="全部" value=""></el-option>
               <el-option
                 v-for="item in tdOptions"
                 :key="item.id"