合并

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" />

src/views/realTimeMonitor/index.vue

@@ -84,8 +84,8 @@
                 :label="item.label"
                 :value="item.value"
               >
-              </el-option> 
-            </el-select>-->
+              </el-option>
+            </el-select> -->
           </div>
 
           <div class="setTimebtn">
@@ -202,8 +202,8 @@ export default {
       channelId: "", //通道装置id
       channelList: "", //通道数据
       channelOption: [], //通道分类
-      channelListOption:[],//通道内容
-      channelListValue:'',
+      channelListOption: [], //通道内容
+      channelListValue: "",
       channelValue: [], //选中的通道
       terminalPhoto: [], //获取拍照装置当前数据
       totalPic: "",
@@ -297,7 +297,7 @@ export default {
 
       this.channelValue = [];
       this.channelOption = [];
-      this.channelListOption = []
+      this.channelListOption = [];
       this.getChannelList(this.channelId); //获取通道id接口
     },
     //获取通道的接口
@@ -319,19 +319,19 @@ export default {
           }); // 选择通道一通道二select框
           console.log(this.channelOption);
           console.log(this.channelValue);
-          this.channelListOption = []
+          this.channelListOption = [];
           this.channelListOption.push({
-              label: '全部',
-              value: '',
-              termid: '',
-            });
+            label: "全部",
+            value: "",
+            termid: "",
+          });
           this.channelList.forEach((item) => {
             this.channelListOption.push({
               label: item.channelname,
               value: item.channelid,
               termid: item.termId,
             });
-          }); 
+          });
           this.channelListValue = this.channelListOption[0].value; //默认选中所有通道
           // console.log(JSON.parse(JSON.stringify(this.channelValue)));
           // this.channelValue = JSON.parse(JSON.stringify(this.channelValue));
@@ -354,6 +354,14 @@ export default {
           }
         })
         .catch((err) => {
+          this.loading = false;
+          console.log("没有绑定通道");
+          this.terminalPhoto = [
+            {
+              path: this.nopicPath,
+            },
+          ];
+          console.log(this.terminalPhoto);
           console.log(err); //代码错误、请求失败捕获
         });
     },
@@ -392,13 +400,13 @@ export default {
     },
     //切换通道
     changeChannelId(val) {
-      let selchannel = []
+      let selchannel = [];
       if (!val) {
         this.channelList.forEach((item) => {
           selchannel.push(item.channelid); //选中所有通道
         });
-      }else{
-        selchannel.push(val)
+      } else {
+        selchannel.push(val);
       }
       let channelObj = {};
       channelObj = this.channelOption.find(function (i) {
@@ -453,7 +461,7 @@ export default {
     },
     //获取GPS位置
     handleShowGPS() {
-      getTermGPSJoggle({ termId: this.channelId })
+      getTermGPSJoggle({ termid: this.channelId })
         .then((res) => {
           console.log(res);
           this.$alert(
@@ -600,7 +608,7 @@ export default {
     //装置信息handleShowInfo
     handleShowInfo() {
       this.$refs.infodialog_ref.display();
-      this.$refs.infodialog_ref.getListData(this.channelId,this.cmdid);
+      this.$refs.infodialog_ref.getListData(this.channelId, this.cmdid);
     },
     //历史图片
     // handlehistoryPic() {

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"