操作项
@@ -274,6 +282,8 @@ export default {
btnShowList: [],
hisShowbtn: true,
menuShowList: [],
+ yzwVal: "", //预置位
+ yzwFlag: false,
};
},
@@ -430,12 +440,24 @@ export default {
"我是获取通道接口之后的通道",
this.channelListOption[0].channelid
);
+
this.selectChannelValue =
Number(localStorage.getItem("channelId")) == 0
? -1
: Number(localStorage.getItem("channelId")); //默认选中所有通道;
this.$store.commit("channelId", this.selectChannelValue); //通道保存在vuex中
this.$store.commit("channelIdList", res.data.list); //将通道保存在vuex中
+ if (this.selectChannelValue != -1) {
+ console.log(this.channelListOption[this.selectChannelValue].type);
+ if (this.channelListOption[this.selectChannelValue].type == 1) {
+ this.yzwFlag = true;
+ } else {
+ this.yzwFlag = false;
+ }
+ } else {
+ console.log("我选的是全部");
+ this.yzwFlag = false;
+ }
this.$parent.getPhotoList(
this.selectChannelValue,
this.dateValue,
@@ -458,9 +480,30 @@ export default {
//切换通道
changeChannelId(val) {
console.log(val);
+ // const a = this.channelListOption.find((channel) => channel.type === 1);
+ // console.log(a);
+ if (val != -1) {
+ console.log(this.channelListOption[val].type);
+ if (this.channelListOption[val].type == 1) {
+ this.yzwFlag = true;
+ } else {
+ this.yzwFlag = false;
+ }
+ } else {
+ console.log("我选的是全部");
+ this.yzwFlag = false;
+ }
this.$store.commit("channelId", val); //将currentData保存在vuex中
this.$parent.getPhotoList(val, this.dateValue, this.areaData.id);
},
+ searchYzw() {
+ this.$parent.getPhotoList(
+ this.selectChannelValue,
+ this.dateValue,
+ this.areaData.id,
+ this.yzwVal
+ );
+ },
//切换gps开启关闭
handleCommandGps(command) {
switch (command) {
@@ -720,6 +763,9 @@ export default {
}
}
}
+ .yzwBox {
+ margin-top: 2px;
+ }
}
.setTimebtn {
.buttonGroup {
diff --git a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
index ede34f2..f0745d1 100644
--- a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
+++ b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
@@ -7,35 +7,37 @@
>
-
通道：
-
-
+ 通道：
+
- {{
- item.alias !== null && item.alias !== ""
- ? item.alias
- : item.channelname
- }}
-
-
-
查询({{ deviceTimeList.length }})
+
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channelname
+ }}
+
+
+
+
+ 查询({{ deviceTimeList.length }})
+
@@ -292,7 +294,12 @@ export default {
const intervalMs = this.timeNum * 60 * 1000;
// 克隆开始时间，避免修改原始timeValue数组中的startOfDay对象
let currentTime = new Date(this.timeValue[0]);
+ // let currentTime = this.timeValue[0];
// 循环生成时间点，直到达到或超过结束时间
+ console.log(currentTime);
+ console.log(this.timeValue[0]);
+ console.log(this.timeValue[1]);
+ console.log(this.timeValue);
while (currentTime <= this.timeValue[1]) {
// 将当前时间点添加到列表中
this.timeList.push({
@@ -738,7 +745,12 @@ export default {
.head {
display: flex;
align-items: center;
- //justify-content: space-around;
+ justify-content: space-between;
+ .left,
+ .right {
+ display: flex;
+ align-items: center;
+ }
h3 {
margin-bottom: 0px;
}
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 86ddede..718e4c3 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -70,9 +70,9 @@
>
- {{
- $moment(item).format("HH:mm")
- }}
+ {{ $moment(item).format("HH:mm") }}+{{ item.preset }}
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 005061d..d8c36e5 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -26,6 +26,15 @@
{{ towertitle }}
+
+
+ {{ channel }}:{{ count }} 张,
+
+ 共{{ totalCount }}张
+
a.localeCompare(b, "zh-Hans-CN", { numeric: true })) // 按通道名称排序
+ .reduce((acc, key) => {
+ acc[key] = this.channelCounts[key];
+ return acc;
+ }, {});
+ },
},
created() {
this.roleName = localStorage.getItem("userName");
@@ -160,16 +180,27 @@ export default {
});
}
},
- getPhotoList(channelId, date, termId) {
+ getPhotoList(channelId, date, termId, yzwValue) {
console.log(channelId, date, termId);
this.swiperLoading = true;
console.log("zhanshi asdadadadadadsddadadadadad", this.terminalPhoto);
//this.terminalPhoto = [];
- getTerminalPhotoListJoggle({
- channelid: channelId,
- time: date,
- terminalid: termId,
- })
+ let params = {};
+ if (yzwValue == "") {
+ params = {
+ channelid: channelId,
+ time: date,
+ terminalid: termId,
+ };
+ } else {
+ params = {
+ channelid: channelId,
+ time: date,
+ terminalid: termId,
+ presetId: yzwValue,
+ };
+ }
+ getTerminalPhotoListJoggle(params)
.then((res) => {
console.log(res);
if (res.data.list.length == 0) {
@@ -180,8 +211,23 @@ export default {
mediaType: 0,
},
];
+ this.channelCounts = {};
+ this.totalCount = 0;
} else {
this.terminalPhoto = res.data.list;
+ const list = this.terminalPhoto;
+ const counts = {};
+ // 遍历数据，统计每个通道的数据条数
+ list.forEach((item) => {
+ const channel = `C${item.channelId}`; // 将通道 ID 转换为 "通道1"、"通道2" 等形式
+ if (!counts[channel]) {
+ counts[channel] = 0;
+ }
+ counts[channel]++;
+ });
+
+ this.channelCounts = counts;
+ this.totalCount = list.length; // 总数据量
}
this.carouselKey++; // 更新key以强制重新渲染
// let newDataList = [];
@@ -285,6 +331,9 @@ export default {
color: #fff !important;
}
}
+ .picnum {
+ font-size: 12px;
+ }
}
.el-loading-mask {
background-color: rgba(0, 0, 0, 0.3);