From 569d022a9da5c024afcf7a25a4dabfeb3429e59a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Aug 2022 10:39:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny-dsjdp
---
public/img/nodata.png | 0
src/views/equipment/index.vue | 25 ++++++++++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/public/img/nodata.png b/public/img/nodata.png
new file mode 100644
index 0000000..41b04d2
--- /dev/null
+++ b/public/img/nodata.png
Binary files differ
diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue
index 196616d..fd1e110 100644
--- a/src/views/equipment/index.vue
+++ b/src/views/equipment/index.vue
@@ -51,6 +51,9 @@
></video>
</div>
</div>
+ <div v-show="vidList.length == 0">
+ <img src="../../../public/img/video-poster.3a25068.png" alt />
+ </div>
</div>
</div>
@@ -168,9 +171,17 @@
>更新时间：{{item.valueDataList[item.valueDataList.length-1].startTime}}</div>
</div>
</div>
+ <!-- <div class="hasNostaList">
+ <img
+ src="../../../public/img/nodata.png"
+ width="160%"
+ height="200%"
+ alt
+ />
+ </div>-->
</div>
</div>
- </div>
+ </div>~
</div>
</div>
@@ -361,7 +372,6 @@
getLandList () {
const farmId = this.currentDetails.id
getLandList(this.$store.state.user.user.dept_id, farmId).then((res) => {
- console.log(res.data.data)
this.plotList = res.data.data
this.plotNameObj = this.plotList[0]
this.plotName = this.plotNameObj.id
@@ -371,10 +381,8 @@
//根据地块id查询监控和监测设备
getStationAndVideoByLandId (id, type) {
getStationAndVideoByLandId(id, type).then((res) => {
- console.log(res, 333333333333333333)
this.vidList = res.data.data.vidList
this.staList = res.data.data.staList
- // this.playFlvVideo()
if (this.staList.length > 0) {
this.$nextTick(() => {
this.getStationDateByStcd(this.staList[0].stcd)
@@ -386,7 +394,6 @@
this.playFlvVideo()
})
})
-
},
// 点击获取对应监测设备数据
@@ -410,17 +417,14 @@
const endTime = `${year}-${month}-${strDate} 23:59:59`
getStationDateByStcd(stcd, startTime, endTime).then((res) => {
this.stationData = res.data.data
- console.log(this.stationData, 99999999999999)
})
},
// flv视频播放
playFlvVideo () {
- console.log(flvjs, flvjs.isSupported(), this.vidList, 5555)
if (flvjs.isSupported()) {
var arr = this.vidList
- console.log('66666666666666666', arr)
arr.forEach((item, index) => {
var videoElement = document.getElementById(`videoElement${index}`)
@@ -435,7 +439,6 @@
enableStashBuffer: false,
fixAudioTimestampGap: false,
})
- console.log(flvPlayer, 44444444)
flvPlayer.attachMediaElement(videoElement)
flvPlayer.load()
flvPlayer.play()
@@ -444,6 +447,7 @@
}
}
+
}
}
</script>
@@ -692,6 +696,9 @@
& > div:last-child {
margin-bottom: 16px;
}
+ .hasNostaList {
+ margin: 0 auto;
+ }
}
}
}
--
Gitblit v1.9.3