diff --git a/src/utils/api/index.js b/src/utils/api/index.js index d816fa9..80ce745 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -684,3 +684,15 @@ export function updateMarkEnableStatus(data) { }, }); } + +///api/getTermStatus +export function getTermStatus(data) { + return request({ + url: "/api/getTermStatus", + method: "post", + data, + headers: { + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); +} diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 9c36fae..de82913 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -48,7 +48,11 @@

- {{ item.linename }}-{{ item.displayname }}-{{ + {{ item.linename }}-{{ + item.displayname !== null && item.displayname !== "" + ? item.displayname + : item.cmdid + }}-{{ item.alias !== null && item.alias !== "" ? item.alias : item.channnelname diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index ceff47d..ae7e6f3 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -114,11 +114,7 @@

操作项

- + 主动拍照 @@ -135,11 +131,7 @@ - + 主动录像 @@ -156,17 +148,10 @@ - + 装置信息 - 拍照时间表