From 3cf25fe6664fd41577b4a3697560c97a09cabaf9 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Fri, 2 Jul 2021 10:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
report-ui/src/assets/styles/common.css | 130 ++++++++--------
report-ui/src/assets/styles/index.scss | 22 ++-
.../views/report/bigscreen/viewer/index.vue | 141 +++++-------------
3 files changed, 118 insertions(+), 175 deletions(-)
diff --git a/report-ui/src/assets/styles/common.css b/report-ui/src/assets/styles/common.css
index d9a249b1..ec543910 100644
--- a/report-ui/src/assets/styles/common.css
+++ b/report-ui/src/assets/styles/common.css
@@ -1,76 +1,72 @@
/* 滚动条 */
- ::-webkit-scrollbar {
- /*垂直滚动条的宽*/
- width: 10px;
- /*垂直滚动条的高*/
- height: 10px;
- }
-
- ::-webkit-scrollbar-track-piece {
- /*修改滚动条的背景和圆角*/
- background: #F7F7F7;
- -webkit-border-radius: 7px;
- }
-
- /*修改垂直滚动条的样式*/
- ::-webkit-scrollbar-thumb:vertical {
- background-color: #dcdfe6;
- -webkit-border-radius: 7px;
- }
-
- /*修改水平滚动条的样式*/
- ::-webkit-scrollbar-thumb:horizontal {
- background-color: #dcdfe6;
- -webkit-border-radius: 7px;
- }
-
- /* IE7 */
- input:focus, a:focus, button:focus, textarea:focus {
- outline: none
- }
- input:-webkit-autofill {
- /* -webkit-box-shadow: 0 0 0px 1000px black inset !important; */
- /* background-color: #ffffff !important;*/
- /* background-image: none !important;
+
+::-webkit-scrollbar-track-piece {
+ /*修改滚动条的背景和圆角*/
+ background: #f7f7f7;
+ -webkit-border-radius: 7px;
+}
+
+/*修改垂直滚动条的样式*/
+::-webkit-scrollbar-thumb:vertical {
+ background-color: #dcdfe6;
+ -webkit-border-radius: 7px;
+}
+
+/*修改水平滚动条的样式*/
+::-webkit-scrollbar-thumb:horizontal {
+ background-color: #dcdfe6;
+ -webkit-border-radius: 7px;
+}
+
+/* IE7 */
+input:focus,
+a:focus,
+button:focus,
+textarea:focus {
+ outline: none;
+}
+input:-webkit-autofill {
+ /* -webkit-box-shadow: 0 0 0px 1000px black inset !important; */
+ /* background-color: #ffffff !important;*/
+ /* background-image: none !important;
color: white !important; */
- box-shadow: 0 0 0px 1000px rgb(229, 233, 238) inset !important;
- -webkit-box-shadow: 0 0 0px 1000px rgba(0, 0, 0,1) inset !important;
- border: 0px solid #CCC!important;
- -webkit-text-fill-color: #FFF;
-
- }
- /* input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
+ box-shadow: 0 0 0px 1000px rgb(229, 233, 238) inset !important;
+ -webkit-box-shadow: 0 0 0px 1000px rgba(0, 0, 0, 1) inset !important;
+ border: 0px solid #ccc !important;
+ -webkit-text-fill-color: #fff;
+}
+/* input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
background-color: #040406 !important;
background-image: none !important;
color: white !important;
} */
- ::-ms-clear {
- display: none;
- }
-
- ::-ms-reveal {
- display: none;
- }
-
- .on-focus:focus {
- border: 1px solid #5BC0DE;
- }
- .clearfix::after{
- content: '';
- display: block;
- clear: both;
- height: 0;
- width:100%;
- }
- .mt10{
- margin-top: 10px;
- }
- .fr{
- float: right;
- }
- .fl{
+::-ms-clear {
+ display: none;
+}
+
+::-ms-reveal {
+ display: none;
+}
+
+.on-focus:focus {
+ border: 1px solid #5bc0de;
+}
+.clearfix::after {
+ content: "";
+ display: block;
+ clear: both;
+ height: 0;
+ width: 100%;
+}
+.mt10 {
+ margin-top: 10px;
+}
+.fr {
+ float: right;
+}
+.fl {
float: left;
}
-.el-table td{
+.el-table td {
padding: 8px 0;
-}
\ No newline at end of file
+}
diff --git a/report-ui/src/assets/styles/index.scss b/report-ui/src/assets/styles/index.scss
index 480a6ef0..2dd6d9b2 100644
--- a/report-ui/src/assets/styles/index.scss
+++ b/report-ui/src/assets/styles/index.scss
@@ -13,13 +13,27 @@ body {
Microsoft YaHei, Arial, sans-serif;
}
-label {
- font-weight: 700;
-}
-
html {
height: 100%;
box-sizing: border-box;
+ /*隐藏滚动条,当IE下溢出,仍然可以滚动*/
+ -ms-overflow-style: none;
+ /*火狐下隐藏滚动条*/
+ scrollbar-width: none;
+}
+// 谷歌浏览器去滚动条
+html::-webkit-scrollbar {
+ display: none;
+}
+.el-image-viewer__close {
+ color: #fff;
+}
+#app {
+ height: 100%;
+}
+
+label {
+ font-weight: 700;
}
#app {
diff --git a/report-ui/src/views/report/bigscreen/viewer/index.vue b/report-ui/src/views/report/bigscreen/viewer/index.vue
index 8fd82647..9f464065 100644
--- a/report-ui/src/views/report/bigscreen/viewer/index.vue
+++ b/report-ui/src/views/report/bigscreen/viewer/index.vue
@@ -7,130 +7,63 @@