From e7b424885a421bf9ece228c216ffc39622ce556f Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 11 May 2025 00:09:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B1=8F=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/css/largeScreenStyle.css | 80 ++ .../public/css/largeScreenStyle.less | 89 ++ .../src/components/certificate-bar-chart.vue | 98 +- yanzhu-bigscreen/src/components/header.vue | 8 +- .../src/components/project-overview-chart.vue | 238 +++-- .../src/views/safety/aiWarning.vue | 995 ++++++++++-------- .../src/views/safety/dumbwaiter.vue | 350 +++++- yanzhu-bigscreen/src/views/videoMonitor.vue | 225 ++-- 8 files changed, 1407 insertions(+), 676 deletions(-) diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css index 011c25cf..2cf9ab5e 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.css +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css @@ -124,6 +124,32 @@ body { height: 54px; line-height: 54px; } + .el-pagination { + line-height: 30px; + margin-top: 40px; + } + .el-pagination .el-pagination__total { + font-size: 24px !important; + vertical-align: middle !important; + } + .el-pagination span { + font-size: 24px; + vertical-align: middle; + } + .el-pagination button, + .el-pagination .number { + font-size: 24px; + width: 32px; + height: 32px; + line-height: 32px; + } + .el-pagination .el-icon { + font-size: 24px !important; + width: 32px; + height: 32px; + align-items: center; + display: inline-flex !important; + } } @media (min-width: 2561px) { .w-scroll::-webkit-scrollbar { @@ -172,6 +198,38 @@ body { height: 60px; line-height: 60px; } + .el-pagination { + line-height: 48px; + margin-top: 40px; + } + .el-pagination .el-pagination__total { + font-size: 30px !important; + vertical-align: middle !important; + } + .el-pagination span { + font-size: 30px; + vertical-align: middle; + } + .el-pagination button, + .el-pagination .number { + font-size: 30px; + width: 48px; + height: 48px; + line-height: 48px; + } + .el-pagination .el-icon { + font-size: 30px !important; + height: 48px; + width: 48px; + align-items: center; + display: inline-flex !important; + } + .el-date-editor * { + font-size: 16px !important; + } + .el-picker-panel__body-wrapper * { + font-size: 16px !important; + } } .img-openwin { position: absolute; @@ -842,6 +900,28 @@ table { left: 172px; background: url("../images/run_circle.png") no-repeat center / 100% 100%; } +.chart-text { + width: 110px; + height: 110px; + position: absolute; + top: 57px; + left: 172px; + z-index: 10; + display: inline-flex; + flex-flow: column; + align-items: center; + justify-content: center; +} +.chart-text .chart-text-title { + font-size: 24px; + font-weight: bold; + color: #0dd2fd; +} +.chart-text .chart-text-sub-title { + font-size: 12px; + font-weight: bold; + color: #a5b5f0; +} .chart-gif { -webkit-transition-property: -webkit-transform; -webkit-transition-duration: 1s; diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.less b/yanzhu-bigscreen/public/css/largeScreenStyle.less index 0d0551f4..e0875b36 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.less +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.less @@ -133,6 +133,34 @@ body{ height: 54px; line-height: 54px; } + .el-pagination { + line-height: 30px; + margin-top: 40px; + .el-pagination__total { + font-size: 24px !important; + vertical-align: middle !important; + } + span { + font-size: 24px; + vertical-align: middle; + } + + button, + .number { + font-size: 24px; + width: 32px; + height: 32px; + line-height: 32px; + } + + .el-icon { + font-size: 24px !important; + width: 32px; + height: 32px; + align-items: center; + display: inline-flex !important; + } + } } @@ -184,6 +212,44 @@ body{ height: 60px; line-height: 60px; } + + .el-pagination { + line-height: 48px; + margin-top: 40px; + .el-pagination__total { + font-size: 30px !important; + vertical-align: middle !important; + } + span { + font-size: 30px; + vertical-align: middle; + } + + button, + .number { + font-size: 30px; + width: 48px; + height: 48px; + line-height: 48px; + } + + .el-icon { + font-size: 30px !important; + height: 48px; + width: 48px; + align-items: center; + display: inline-flex !important; + } + } + .el-date-editor{ + *{ + font-size:16px !important; + } + } + .el-picker-panel__body-wrapper{ + * { + font-size: 16px !important; } + } } .img-openwin{ position: absolute; @@ -840,6 +906,29 @@ table{ left: 172px; background: url("../images/run_circle.png") no-repeat center/100% 100%; } +.chart-text { + width: 110px; + height: 110px; + position: absolute; + top: 57px; + left: 172px; + z-index: 10; + display: inline-flex; + display: inline-flex; + flex-flow: column; + align-items: center; + justify-content: center; + .chart-text-title{ + font-size: 24px; + font-weight: bold; + color: #0dd2fd; + } + .chart-text-sub-title { + font-size: 12px; + font-weight: bold; + color: #a5b5f0; + } +} .chart-gif{ -webkit-transition-property: -webkit-transform; -webkit-transition-duration: 1s; diff --git a/yanzhu-bigscreen/src/components/certificate-bar-chart.vue b/yanzhu-bigscreen/src/components/certificate-bar-chart.vue index 3aad2ed7..5524d0b7 100644 --- a/yanzhu-bigscreen/src/components/certificate-bar-chart.vue +++ b/yanzhu-bigscreen/src/components/certificate-bar-chart.vue @@ -1,37 +1,34 @@ \ No newline at end of file diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index bfa5ae6c..38a01a1d 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -337,12 +337,14 @@ export default { margin-right: 60px !important; position: relative; top: -5px; + width: 260px !important; + right: 10px; } } .header-sel-project-pop { transform: scale(1.5); - width: 200px; + width: 330px; min-width: unset !important; margin-left: 50px; } @@ -383,12 +385,14 @@ export default { margin-right: 100px !important; position: relative; top: -5px; + width: 273px !important; + right: 40px; } } .header-sel-project-pop { transform: scale(2); - width: 200px; + width: 300px; min-width: unset !important; margin-left: 100px; } diff --git a/yanzhu-bigscreen/src/components/project-overview-chart.vue b/yanzhu-bigscreen/src/components/project-overview-chart.vue index dcc60c87..b87ad353 100644 --- a/yanzhu-bigscreen/src/components/project-overview-chart.vue +++ b/yanzhu-bigscreen/src/components/project-overview-chart.vue @@ -1,10 +1,12 @@ diff --git a/yanzhu-bigscreen/src/views/safety/aiWarning.vue b/yanzhu-bigscreen/src/views/safety/aiWarning.vue index 0d14eef1..e41b8c9b 100644 --- a/yanzhu-bigscreen/src/views/safety/aiWarning.vue +++ b/yanzhu-bigscreen/src/views/safety/aiWarning.vue @@ -1,435 +1,604 @@ + diff --git a/yanzhu-bigscreen/src/views/safety/dumbwaiter.vue b/yanzhu-bigscreen/src/views/safety/dumbwaiter.vue index b8dbaed0..34def731 100644 --- a/yanzhu-bigscreen/src/views/safety/dumbwaiter.vue +++ b/yanzhu-bigscreen/src/views/safety/dumbwaiter.vue @@ -27,11 +27,11 @@ - + -
+
监控列表
-
+
@@ -92,10 +92,10 @@ - - + +
- +
@@ -186,8 +186,8 @@
- -
+ +
报警分析
@@ -239,7 +239,7 @@
暂无预警数据
-
+
{{ item.warn_context }}
@@ -258,7 +258,7 @@ -
+
运行数据
@@ -443,6 +443,9 @@ import '@/components/dumbwaiter-2.js' export default { data() { return { + chart1Key: 0, + chart1Height: 100, + dpi: '', deviceToal: 4, deviceOnlineCount: 10, certificateData: [], @@ -498,9 +501,23 @@ export default { }) this.selProject = this.$store.getters.selProject this.init() + this.dpi = this.$dpi() + this.resize() + window.addEventListener('resize', () => { + if (this.dpi != this.$dpi()) { + this.dpi = this.$dpi() + this.resize() + } + }) }, created() {}, methods: { + resize() { + this.chart1Key++ + let is1K = this.$dpi() == '1K' + let is2K = this.$dpi() == '2K' + this.chart1Height = is1K ? 100 : is2K ? 120 : 160 + }, init() { this.certificateData = JSON.parse('[{"text":"在线数量","value":5},{"text":"离线数量","value":1}]') this.listData = JSON.parse( @@ -656,6 +673,31 @@ export default { diff --git a/yanzhu-bigscreen/src/views/videoMonitor.vue b/yanzhu-bigscreen/src/views/videoMonitor.vue index e842bbab..3245b188 100644 --- a/yanzhu-bigscreen/src/views/videoMonitor.vue +++ b/yanzhu-bigscreen/src/views/videoMonitor.vue @@ -1,54 +1,43 @@