From 8d8fd19e5dcf06cdea982d9a3081e455c9e9f778 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Fri, 26 Apr 2024 18:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/carouselChart.vue | 20 ++-- src/views/reportData/index.vue | 51 ++++++++-- .../photostatis/components/ipDialog.vue | 18 ++++ .../photostatis/components/photoList.vue | 24 ++++- src/views/reportData/photostatis/index.vue | 93 ++++++++++++++++--- src/views/system/drawPic.vue | 2 +- 6 files changed, 171 insertions(+), 37 deletions(-) diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index 3b98c22..98714ea 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -96,8 +96,8 @@ > - -

+ +

- (已告警) +

@@ -465,7 +465,7 @@ export default { //设置线条颜色，必须放在绘制之前 this.ctx.strokeStyle = "#ff0000"; // 线宽设置，必须放在绘制之前 - this.ctx.lineWidth = 1; + this.ctx.lineWidth = 2; this.labelMarkArrs = data.alarmlist; this.recArrs = []; for (var i = 0; i < this.labelMarkArrs.length; i++) { @@ -545,7 +545,7 @@ export default { //设置线条颜色，必须放在绘制之前 this.ctx.strokeStyle = "#ff0000"; // 线宽设置，必须放在绘制之前 - this.ctx.lineWidth = 1; + this.ctx.lineWidth = 2; this.labelMarkArrs = data.alarmlist; this.recArrs = []; for (var i = 0; i < this.labelMarkArrs.length; i++) { @@ -560,11 +560,7 @@ export default { (this.labelMarkArrs[i].height * this.canvas.height) / 2, w: this.labelMarkArrs[i].width * this.canvas.width, h: this.labelMarkArrs[i].height * this.canvas.height, - text: - this.labelMarkArrs[i].enname + - "&nbsp;&nbsp;" + - this.labelMarkArrs[i].prob + - "%", + text: this.labelMarkArrs[i].enname + this.labelMarkArrs[i].prob + "%", type: this.labelMarkArrs[i].label, }); } @@ -574,7 +570,7 @@ export default { // >2的判断是为了防止误触画出来的数据 if (this.recArrs[i].w > 2 && this.recArrs[i].h > 2) { this.ctx.beginPath(); - this.ctx.lineWidth = 1; // 矩形框的线条宽度 + this.ctx.lineWidth = 2; // 矩形框的线条宽度 this.ctx.strokeStyle = "rgb(255, 255, 0)"; // 矩形框的线条颜色 // 设置填充样式 // this.ctx.fillStyle = "rgba(22, 158, 140, 0.4)"; // 蓝色，半透明 @@ -593,7 +589,7 @@ export default { // 如果有文本信息，填充文本信息 if (this.recArrs[i].text) { this.ctx.font = "100 16px 微软雅黑"; - this.ctx.lineWidth = 1; + this.ctx.lineWidth = 2; this.ctx.strokeStyle = "rgb(255,255,0)"; this.ctx.strokeText( this.recArrs[i].text, diff --git a/src/views/reportData/index.vue b/src/views/reportData/index.vue index d43b285..1f9dd2d 100644 --- a/src/views/reportData/index.vue +++ b/src/views/reportData/index.vue @@ -3,10 +3,27 @@ + + 照片统计 + + - + + 设备状态列表 + + + @@ -25,7 +42,10 @@ export default { equipmentStatus, }, data() { - return {}; + return { + picSearchFlag: true, + statusFlag: false, + }; }, created() {}, mounted() {}, @@ -34,12 +54,17 @@ export default { handleTabClick(tab, event) { // 当标签页被点击时触发 const tabName = tab.label; + console.log(tab); if (tabName === "照片统计") { + this.picSearchFlag = true; + this.statusFlag = false; // 调用照片统计组件的方法 if (this.$refs.photoStatisRef) { this.$refs.photoStatisRef.onSubmit(); // 假设someMethod是你要调用的方法 } } else if (tabName === "设备状态列表") { + this.picSearchFlag = false; + this.statusFlag = true; // 调用设备状态列表组件的方法 if (this.$refs.equipmentStatusRef) { this.$refs.equipmentStatusRef.onSubmit(); // 假设someOtherMethod是你要调用的方法 @@ -47,6 +72,10 @@ export default { } // 可以继续添加其他标签页的逻辑 }, + handlePicSearch() { + console.log("aaaaaaaaaaaa"); + this.$refs.photoStatisRef.showSearch(); + }, }, }; @@ -55,12 +84,22 @@ export default { width: calc(100% - 24px); height: calc(100% - 24px); padding: 12px 12px; - + .el-tabs--border-card > .el-tabs__content { + padding: 8px; + } .el-tabs { height: 100%; + + .el-tabs__header { + .el-button--default, + .el-button--primary { + width: auto; + margin-left: 12px; + } + } .el-tabs__content { - height: calc(100% - 69px); - overflow: auto; + height: calc(100% - 65px); + //overflow: auto; .el-tab-pane { height: 100%; } diff --git a/src/views/reportData/photostatis/components/ipDialog.vue b/src/views/reportData/photostatis/components/ipDialog.vue index 8e2b0fc..b58e2a9 100644 --- a/src/views/reportData/photostatis/components/ipDialog.vue +++ b/src/views/reportData/photostatis/components/ipDialog.vue @@ -19,6 +19,7 @@ style="width: 100%" height="calc(100% - 0px)" fit + border > @@ -191,6 +192,23 @@ export default { } .ipContain { height: calc(100% - 40px); + .el-table { + color: #000; + thead { + color: #000; + font-weight: bold; + } + th.el-table__cell { + background: #dcdcdc !important; + } + td.el-table__cell, + th.el-table__cell.is-leaf { + border-bottom: 1px solid #dcdcdc; + } + .el-table__cell { + border-right: 1px solid #dcdcdc; + } + } } } .el-dialog__headerbtn { diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue index 87e4450..65f4f66 100644 --- a/src/views/reportData/photostatis/index.vue +++ b/src/views/reportData/photostatis/index.vue @@ -1,6 +1,6 @@