From 1ae5558c65d0b6ab624a67785f9228b63c4873ea Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 24 Mar 2022 16:29:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMonitorManage/AppMonitorManage.vue | 62 ++++++++++++++++--- vue.config.js | 2 +- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue index 48f06e1e..b3d7703a 100644 --- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue +++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue @@ -11,8 +11,16 @@
-
+
+ {{ m.name }} +
@@ -93,18 +101,18 @@ let {id} = monitor, index = this.monitors.findIndex(e => e.id == id) if (index > -1) { - this.monitors.splice(index, 1) - this.monitors.map((e, i) => { - if (i > index) { - this.showMonitor(e, true) - } - }) + this.$message.error('该监控视频已存在') } else if (this.monitors.length >= this.splitScreen && this.splitScreen > 1) { - this.$message.warning("可分屏监控已满,请先取消其他的监控") + this.$message.error("可分屏监控已满,请先取消其他的监控") } else { this.showMonitor(monitor) } }, + + removeMonitor (i) { + this.monitors.splice(i, 1) + }, + showMonitor(monitor, refresh = false) { let {id: deviceId} = monitor deviceId && this.instance.post("/app/appzyvideoequipment/getWebSdkUrl", null, { @@ -113,14 +121,17 @@ if (res?.data) { this.videoUrl = res.data let data = { - url: res.data + url: res.data, + isShowPlayBtn: false } if (refresh) { monitor.url = data.url } else if (this.splitScreen == 1) { this.monitors = [{...monitor, ...data}] } else { - this.monitors.push({...monitor, ...data}) + if (this.monitors.findIndex(e => e.id == monitor.id) === -1 && this.monitors.length <= this.splitScreen) { + this.monitors.push({...monitor, ...data}) + } } } }) @@ -251,9 +262,40 @@ } .videoBox { + position: relative; background: #000; flex-shrink: 0; + span { + position: absolute; + bottom: 0; + left: 0; + z-index: 11; + width: 60%; + height: 38px; + line-height: 38px; + padding: 0 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #fff; + font-size: 16px; + } + + i { + position: absolute; + top: 50%; + left: 50%; + z-index: 11; + font-size: 60px; + cursor: pointer; + transform: translate(-50%, -50%); + + &:hover { + opacity: 0.6; + } + } + iframe { width: 100%; height: 100%; diff --git a/vue.config.js b/vue.config.js index 4c62f6b4..e4ebd77c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -64,7 +64,7 @@ module.exports = { proxy: { //设置代理,可解决跨5 '/lan': { - target: 'http://192.168.1.87:9000/', + target: 'https://sdtestweb.sdvillage.cn', changeOrigin: true, pathRewrite: { //地址重写 From 476bc5c74d708f79ce529f492552373ab9fb9985 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 24 Mar 2022 16:29:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index e4ebd77c..4c62f6b4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -64,7 +64,7 @@ module.exports = { proxy: { //设置代理,可解决跨5 '/lan': { - target: 'https://sdtestweb.sdvillage.cn', + target: 'http://192.168.1.87:9000/', changeOrigin: true, pathRewrite: { //地址重写 From c2d9aa6d062dc27fc7feee4db6546308af5a6f69 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 24 Mar 2022 16:42:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue index b3d7703a..ec8d49ce 100644 --- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue +++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue @@ -89,7 +89,7 @@ created () { this.selected.areaId = this.user.info.areaId - this.disabledLevel = this.user.info.areaList.length + this.disabledLevel = this.user.info.areaList.length - 1 }, methods: { From a8db0542d7ee32f3e0ecc38f97a59b73f682a028 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 24 Mar 2022 17:33:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jianping/AppVisitToVerify/components/List.vue | 7 ------- .../monitor/AppMonitorManage/AppMonitorManage.vue | 14 +++++++++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/jianping/AppVisitToVerify/components/List.vue b/packages/jianping/AppVisitToVerify/components/List.vue index 8228518a..730db179 100644 --- a/packages/jianping/AppVisitToVerify/components/List.vue +++ b/packages/jianping/AppVisitToVerify/components/List.vue @@ -44,13 +44,6 @@ :size.sync="search.size" @selection-change="(v) => (ids = v.map((e) => e.id))" @getList="getList"> - - -
详情 diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue index ec8d49ce..57f508a6 100644 --- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue +++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue @@ -4,7 +4,7 @@ :render-item="renderTreeItem" ref="DeviceSlider"/>
- + @@ -14,11 +14,11 @@
- + {{ m.name }}
@@ -98,6 +98,8 @@ this.$fullscreen(this.fullscreen) }, handleSelectMonitor(monitor) { + if (monitor.type !== '1') return + let {id} = monitor, index = this.monitors.findIndex(e => e.id == id) if (index > -1) { @@ -109,6 +111,12 @@ } }, + onChange (e) { + if (e === 1 && this.monitors.length) { + this.monitors = [this.monitors[0]] + } + }, + removeMonitor (i) { this.monitors.splice(i, 1) }, From fe3a637255ceaf01e8674654deb850c24e896e18 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 24 Mar 2022 17:52:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shandong/monitor/AppMonitorManage/AppMonitorManage.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue index 57f508a6..c00d2b72 100644 --- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue +++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue @@ -292,12 +292,11 @@ i { position: absolute; - top: 50%; - left: 50%; + right: 20px; + top: 40px; z-index: 11; font-size: 60px; cursor: pointer; - transform: translate(-50%, -50%); &:hover { opacity: 0.6;