From bf6022e3e27ebc40665e5e1b35d99b6165fb6224 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 28 Jun 2023 15:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=A3=85=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/alarmHandling/index.vue | 23 +- src/views/cameraChannel/index.vue | 6 +- .../components/imageCapture.vue | 173 +++---- .../components/imageCapturebak.vue | 425 ++++++++++++++++++ .../components/parameterSetDialog.vue | 364 +++++++++++++++ .../photographicDevice/index.vue | 18 +- src/views/realTimeMonitor/index.vue | 1 + 7 files changed, 882 insertions(+), 128 deletions(-) create mode 100644 src/views/management/monitoringEquipment/photographicDevice/components/imageCapturebak.vue create mode 100644 src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index 8be1f2b..fb2388c 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -205,9 +205,9 @@ /> --> @@ -327,11 +327,6 @@ export default { this.getTableList(); }, methods: { - imgOnload() { - console.log("加载完成"); - //this.alarmLoading = false; - this.canvasloading = false; - }, handleBigPicbox(val) { this.canvasloading = true; if (val.path !== "" && this.tableData.length !== 0) { @@ -504,10 +499,10 @@ export default { //点击当前行 handleRowClick(row) { //this.$refs.multipleTable.toggleRowSelection(row); - //this.alarmLoading = true; - console.log(row); + console.log(this.$refs.picJpg.complete); + this.alarmLoading = true; this.photoPic = row.path; - console.log(this.photoPic); + this.selectRow = row; //未读变已读 if (row.isread == 0) { @@ -525,13 +520,10 @@ export default { }); }, 300); } - setTimeout(function () { - console.log("关闭遮罩"); - this.alarmLoading = false; - }, 1000); this.$nextTick(() => { this.drawline(row); + this.imgOnload(); }); }, //手动拍照 @@ -598,6 +590,11 @@ export default { } return moment(date).format("YYYY-MM-DD HH:mm:ss"); }, + imgOnload() { + console.log("加载完成"); + this.alarmLoading = false; + this.canvasloading = false; + }, }, }; diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue index 4036338..d457e8c 100644 --- a/src/views/cameraChannel/index.vue +++ b/src/views/cameraChannel/index.vue @@ -209,12 +209,12 @@ export default { height: calc(100% - 48px); //background: #fcc; .el-tag--dark.el-tag--success { - background: linear-gradient(180deg, #67c23a 10%, #3fb504 100%); + background: linear-gradient(180deg, #4cdbc8 10%, #128071 100%); border-color: transparent; } .el-tag--dark.el-tag--warning { - background: linear-gradient(180deg, #e6a23c 10%, #e78c04 100%); - border-color: transparent; + background: linear-gradient(180deg, #4cdbc8 10%, #128071 100%); + border: 0px solid transparent; } } } diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue index 3c10d77..6d7f003 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue @@ -1,16 +1,14 @@ diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue new file mode 100644 index 0000000..08a197c --- /dev/null +++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue @@ -0,0 +1,364 @@ + + + diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 07bb9a0..01fa416 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -267,6 +267,11 @@ v-if="roleUser != 2" >