diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index e9a6818..93be162 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -8,12 +8,12 @@
bigPicPath.indexOf('nopic') == -1 &&
bigPicPath.indexOf('videos') == -1
"
- :style="bigPicPath ? 'backgroundImage:url(' + bigPicPath + ')' : ''"
+ :style="bigPicPath ? 'backgroundImage:url(' + bgbigPath + ')' : ''"
>
![]()
4) {
@@ -406,6 +412,7 @@ export default {
this.activeSmall = index;
this.mediaType = row.mediaType;
this.bigPicPath = row.path + "!1366x768";
+ this.bgbigPath = row.path + "!1366x768";
getCoordinate({
channelId: row.channelId,
needPic: "1",
@@ -570,6 +577,9 @@ export default {
position: absolute;
z-index: 3;
opacity: 0;
+ .animImg {
+ opacity: 0;
+ }
}
.mark {
position: absolute;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 37c20f3..f0e212d 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -466,41 +466,46 @@ export default {
.then((res) => {
console.log(res);
this.channelList = res.data.list;
- console.log(this.channelList);
- this.channelOption = [];
- this.channelList.forEach((item) => {
- this.channelOption.push({
- label: item.channelname,
- value: item.channelid,
- termid: item.termId,
- alias: item.alias,
- });
- }); // 选择通道一通道二select框
- console.log(this.channelOption);
- this.channelListOption = [];
- this.channelListOption.push({
- label: "全部",
- value: -1,
- termid: "",
- alias: "",
- });
- this.channelList.forEach((item) => {
+ if (this.channelList.length == 0) {
+ console.log("没有通道");
+ this.getTerminalPhotoList(-1, this.dateValue, this.zztermId); //获取图片列表是传当前设备的 id 和termid
+ } else {
+ console.log(this.channelList);
+ this.channelOption = [];
+ this.channelList.forEach((item) => {
+ this.channelOption.push({
+ label: item.channelname,
+ value: item.channelid,
+ termid: item.termId,
+ alias: item.alias,
+ });
+ }); // 选择通道一通道二select框
+ console.log(this.channelOption);
+ this.channelListOption = [];
this.channelListOption.push({
- label: item.channelname,
- value: item.channelid,
- termid: item.termId,
- alias: item.alias,
+ label: "全部",
+ value: -1,
+ termid: "",
+ alias: "",
});
- });
- this.selectChannelValue = this.channelListOption[0].value; //默认选中所有通道
- this.getTerminalPhotoList(
- this.selectChannelValue,
- this.dateValue,
- this.channelList[0].termId
- ); //获取图片列表是传当前设备的 id 和termid
- this.selectDyId = res.data.dyId;
- this.selectLineId = res.data.lineId;
- this.selectTowerId = res.data.towerId;
+ this.channelList.forEach((item) => {
+ this.channelListOption.push({
+ label: item.channelname,
+ value: item.channelid,
+ termid: item.termId,
+ alias: item.alias,
+ });
+ });
+ this.selectChannelValue = this.channelListOption[0].value; //默认选中所有通道
+ this.getTerminalPhotoList(
+ this.selectChannelValue,
+ this.dateValue,
+ this.channelList[0].termId
+ ); //获取图片列表是传当前设备的 id 和termid
+ this.selectDyId = res.data.dyId;
+ this.selectLineId = res.data.lineId;
+ this.selectTowerId = res.data.towerId;
+ }
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
diff --git a/src/views/stritl/index.vue b/src/views/stritl/index.vue
index b4327a5..2c4a8ec 100644
--- a/src/views/stritl/index.vue
+++ b/src/views/stritl/index.vue
@@ -3,12 +3,12 @@
装置数量统计
- 查看
+ > -->
-
+
装置总数
{{ termDataNum.totalNum }}
@@ -47,11 +47,7 @@
>
-
+
告警类型统计
@@ -66,11 +62,7 @@
>
-
+
{
- return this.$moment(x.date).format("yy-MM-DD");
+ return this.$moment(x.date).format("MM-DD");
}),
axisTick: {
alignWithLabel: true,
@@ -489,6 +491,12 @@ export default {
flex-direction: column;
justify-content: space-around;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ &:first-child {
+ &:hover {
+ cursor: pointer;
+ }
+ }
+
span {
color: #333;
font-size: 16px;