diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css index 9c762636..fc93caf8 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.css +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css @@ -30,7 +30,23 @@ body { font-size: 16px; overflow: auto; } +.scroll::-webkit-scrollbar { + width: 8px ; + height: 8px; +} +.scroll::-webkit-scrollbar-thumb { + background-color: #01a9ff; + border-radius: 4px ; +} @media (max-width: 1920px) { + .w-scroll::-webkit-scrollbar { + width: 8px !important; + height: 8px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: #01a9ff; + border-radius: 4px !important; + } #app { width: 1912px; height: 1080px; @@ -62,16 +78,24 @@ body { } } @media (min-width: 1921px) and (max-width: 2560px) { + .w-scroll::-webkit-scrollbar { + width: 16px !important; + height: 16px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: #01a9ff; + border-radius: 8px !important; + } #app { - width: 2552px; + width: 2550px; height: 1440px; } .screen-content-max { - width: 2552px; + width: 2550px; height: 1440px; } .background_video video { - width: 2552px; + width: 2550px; height: 1440px; } .div-header { @@ -102,6 +126,14 @@ body { } } @media (min-width: 2561px) { + .w-scroll::-webkit-scrollbar { + width: 20px !important; + height: 20px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: #01a9ff; + border-radius: 10px !important; + } #app { width: 3832px; height: 2160px; @@ -175,14 +207,6 @@ body { padding: 12px; height: calc(100% - 48px); } -.scroll::-webkit-scrollbar { - width: 8px; - height: 8px; -} -.scroll::-webkit-scrollbar-thumb { - background-color: #01a9ff; - border-radius: 4px; -} body::-webkit-scrollbar { width: 8px; height: 8px; @@ -1884,18 +1908,6 @@ table { overflow-x: auto; position: relative; } -.dangerous-timeline-max::-webkit-scrollbar { - width: 10px; - height: 10px; -} -.dangerous-timeline-max::-webkit-scrollbar-thumb { - border-radius: 10px; - background: #192c64; -} -.dangerous-timeline-max::-webkit-scrollbar-track { - border-radius: 10px; - background: #010b2d; -} .dangerous-timeline-min { z-index: 2; position: absolute; diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.less b/yanzhu-bigscreen/public/css/largeScreenStyle.less index 31ae2229..9957bcdf 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.less +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.less @@ -36,8 +36,24 @@ body{ overflow: auto; } +.scroll::-webkit-scrollbar { + width: 8px ; + height: 8px; +} +.scroll::-webkit-scrollbar-thumb { + background-color: rgb(1, 169, 255); + border-radius: 4px ; +} @media (max-width: 1920px) { + .w-scroll::-webkit-scrollbar { + width: 8px !important; + height: 8px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: rgb(1, 169, 255); + border-radius: 4px !important; + } #app{ width:1912px; height: 1080px; @@ -70,16 +86,24 @@ body{ } @media (min-width: 1921px) and (max-width: 2560px) { + .w-scroll::-webkit-scrollbar { + width: 16px !important; + height: 16px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: rgb(1, 169, 255); + border-radius: 8px !important; + } #app{ - width:2552px; + width:2550px; height:1440px; } .screen-content-max{ - width:2552px; + width:2550px; height:1440px; } .background_video video{ - width:2552px; + width:2550px; height:1440px; } .div-header{ @@ -113,6 +137,14 @@ body{ @media (min-width: 2561px) { + .w-scroll::-webkit-scrollbar { + width: 20px !important; + height: 20px !important; + } + .w-scroll::-webkit-scrollbar-thumb { + background-color: rgb(1, 169, 255); + border-radius: 10px !important; + } #app{ width:3832px; height:2160px; @@ -192,14 +224,6 @@ body{ padding:12px; height: calc(100% - 48px); } -.scroll::-webkit-scrollbar { - width: 8px; - height: 8px; -} -.scroll::-webkit-scrollbar-thumb { - background-color: rgb(1, 169, 255); - border-radius: 4px; -} body::-webkit-scrollbar{ width: 8px; height: 8px; @@ -1882,18 +1906,7 @@ table{ overflow-x: auto; position: relative; } -.dangerous-timeline-max::-webkit-scrollbar { - width: 10px; - height: 10px; -} -.dangerous-timeline-max::-webkit-scrollbar-thumb { - border-radius: 10px; - background: #192c64; -} -.dangerous-timeline-max::-webkit-scrollbar-track { - border-radius: 10px; - background: #010b2d; -} + .dangerous-timeline-min{ z-index: 2; position: absolute; diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 090cd070..d0b87a55 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -111,7 +111,7 @@ export default { @media (min-width: 1921px) and (max-width: 2560px) { .div-header { .head-nav { - font-size: 16px; + font-size: 18px; width: auto; height: auto; padding: 5px 40px; @@ -146,10 +146,10 @@ export default { @media (min-width: 2561px) { .div-header { .head-nav { - font-size: 20px; + font-size: 30px; width: auto; height: auto; - padding: 5px 40px; + padding: 10px 30px; position: relative; top: -8px; } diff --git a/yanzhu-bigscreen/src/pages-old/components/MonitAndWarning.vue b/yanzhu-bigscreen/src/pages-old/components/MonitAndWarning.vue deleted file mode 100644 index 66a80531..00000000 --- a/yanzhu-bigscreen/src/pages-old/components/MonitAndWarning.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - diff --git a/yanzhu-bigscreen/src/pages-old/projectDetail.vue b/yanzhu-bigscreen/src/pages-old/projectDetail.vue index 4eb94888..94907f35 100644 --- a/yanzhu-bigscreen/src/pages-old/projectDetail.vue +++ b/yanzhu-bigscreen/src/pages-old/projectDetail.vue @@ -742,7 +742,7 @@ import "../components/module/module-one-1-2"; import "../components/staff-survey-chart"; import mapModle from "./detail/mapModle.vue"; -import MonitAndWarning from "./components/MonitAndWarning.vue"; +import MonitAndWarning from "../views/components/MonitAndWarning.vue"; import projectInfoDlg from "./detail/projectInfoDlg.vue"; import debounce from "lodash.debounce"; import AttendanceDetailDialog from "./components/AttendanceDetailDialog.vue"; diff --git a/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue b/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue new file mode 100644 index 00000000..29467540 --- /dev/null +++ b/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue @@ -0,0 +1,314 @@ + + + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index fa9d55a3..45a4fd1e 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -359,9 +359,9 @@ - -
-
+ +
+