From 0b7801b302aeab2ea21b48f0193155f9a84c3083 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 29 Dec 2024 22:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/api/index.js | 4 +- yanzhu-bigscreen/src/api/videoMonitor.js | 18 ++ .../src/assets/icons/svg/4screen.svg | 1 + .../src/assets/icons/svg/9screen.svg | 3 + .../src/assets/icons/svg/video.svg | 1 + yanzhu-bigscreen/src/components/header.vue | 4 +- .../src/components/module/module-one-1-3.vue | 7 +- yanzhu-bigscreen/src/router/index.js | 9 + yanzhu-bigscreen/src/views/videoMonitor.vue | 229 ++++++++++++++++++ .../src/assets/icons/svg/9screen.svg | 4 +- .../src/views/manage/videoMonitor/list.vue | 47 ++-- 11 files changed, 304 insertions(+), 23 deletions(-) create mode 100644 yanzhu-bigscreen/src/api/videoMonitor.js create mode 100644 yanzhu-bigscreen/src/assets/icons/svg/4screen.svg create mode 100644 yanzhu-bigscreen/src/assets/icons/svg/9screen.svg create mode 100644 yanzhu-bigscreen/src/assets/icons/svg/video.svg create mode 100644 yanzhu-bigscreen/src/views/videoMonitor.vue diff --git a/yanzhu-bigscreen/src/api/index.js b/yanzhu-bigscreen/src/api/index.js index e3c273a9..2e81d2d3 100644 --- a/yanzhu-bigscreen/src/api/index.js +++ b/yanzhu-bigscreen/src/api/index.js @@ -5,6 +5,7 @@ import weather from './weather' import detail from './detail' import dict from './dict' import greenCarbon from './greenCarbon' +import videoMonitor from './videoMonitor' export default { http:axios, downFile:download, @@ -12,5 +13,6 @@ export default { weather, detail, dict, - greenCarbon + greenCarbon, + videoMonitor } \ No newline at end of file diff --git a/yanzhu-bigscreen/src/api/videoMonitor.js b/yanzhu-bigscreen/src/api/videoMonitor.js new file mode 100644 index 00000000..4395fcbe --- /dev/null +++ b/yanzhu-bigscreen/src/api/videoMonitor.js @@ -0,0 +1,18 @@ +import request from "@/utils/request"; +const listVideoMonitor = (query) => { + return request({ + url: "/manage/videoMonitor/list", + method: "get", + params: query + }); + }; + const getYsToken=(id)=>{ + return request({ + url: '/manage/videoMonitor/getYsToken/' + id, + method: 'get' + }) + } + export default { + listVideoMonitor, + getYsToken + } \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/4screen.svg b/yanzhu-bigscreen/src/assets/icons/svg/4screen.svg new file mode 100644 index 00000000..f85e93ce --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/4screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/9screen.svg b/yanzhu-bigscreen/src/assets/icons/svg/9screen.svg new file mode 100644 index 00000000..89fcbf50 --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/9screen.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/assets/icons/svg/video.svg b/yanzhu-bigscreen/src/assets/icons/svg/video.svg new file mode 100644 index 00000000..396885fb --- /dev/null +++ b/yanzhu-bigscreen/src/assets/icons/svg/video.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index cf3ba1c7..0159b1ca 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -8,7 +8,7 @@
安全管理
质量管理
进度管理
- +
视频监控
@@ -106,7 +106,7 @@ export default { return; } this.nav = n; - let path = ["/index", "/detail", "/prjSafety", "/prjQuality", "/prjProgress","/greenCarbon"][n - 1]; + let path = ["/index", "/detail", "/prjSafety", "/prjQuality", "/prjProgress","/greenCarbon","/videoMonitor"][n - 1]; this.$router.push(path); }, doLogout() { diff --git a/yanzhu-bigscreen/src/components/module/module-one-1-3.vue b/yanzhu-bigscreen/src/components/module/module-one-1-3.vue index 932372c4..579ff33e 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-1-3.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-1-3.vue @@ -1,6 +1,6 @@
- - + +
-
-
- +
{{ it.monitorName }}
@@ -59,6 +60,8 @@ import useUserStore from '@/store/modules/user' const userStore = useUserStore() const { proxy } = getCurrentInstance(); const data = reactive({ + mode1:4, + mode2:9, prjInfo: null, projects: [], selPrjId: '', @@ -67,9 +70,9 @@ const data = reactive({ videoMonitors: [], selVideo: null, elKey: 0, - showMode: 'sigle', + showMode: 'all', total: 0, - showSize: 2, + showSize: 4, showIndex: 1, showList: [], }) @@ -98,10 +101,12 @@ function doSelectItem(it) { loadVideo(data.selVideo); } function showAllVideo() { - data.selVideo.active = false; + if(data.selVideo){ + data.selVideo.active = false; + } data.selVideo = null; data.showMode = "all"; - data.showSize = 2; + data.showSize = data.mode1; data.showIndex = 1; showAllData(); } @@ -135,11 +140,12 @@ function loadData() { it.active = false; return it; }); - data.selVideo = data.videoMonitors.length > 0 ? data.videoMonitors[0] : null; - if (data.selVideo) { - data.selVideo.active = true; - loadVideo(data.selVideo); - } + showAllVideo(); + //data.selVideo = data.videoMonitors.length > 0 ? data.videoMonitors[0] : null; + //if (data.selVideo) { + // data.selVideo.active = true; + // loadVideo(data.selVideo); + //} }); } /** 查询项目列表 */ @@ -163,7 +169,12 @@ getProjectList(); position: absolute; width: 100%; padding: 12px; - + .video-main{ + height: 100%; + &.show-prjs{ + height: calc(100% - 40px); + } + } .video-name-list { height: 100%; background: #fff;