diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 638d2d7..0ba890c 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -109,11 +109,11 @@ export default { index: "devicePhotoSchedule", title: "拍照时间表设置", }, - { - icon: "el-icon-picture-outline", - index: "imageSettings", - title: "图像采集参数设置", - }, + // { + // icon: "el-icon-picture-outline", + // index: "imageSettings", + // title: "图像采集参数设置", + // }, ], }, // { diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 5244ecd..3f591fa 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -1,91 +1,89 @@ @@ -157,101 +180,156 @@ export default { width: 100%; display: flex; flex-direction: column; - height: calc(100% - 26px); + height: calc(100% - 24px); box-sizing: border-box; - .gallery-top { - //background: #fcc; + .picTop { width: 100%; height: 80%; overflow: hidden; margin-bottom: 4px; - //border: 3px solid transparent; - .swiper-slide { + position: relative; + &:hover { + .arrow { + opacity: 1; + transition: all 0.5s ease-in; + } + } + .bigimg { width: 100%; - overflow: hidden; - .bigimg { - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + position: relative; + background-size: 100% 100%; + .mark { + position: absolute; + bottom: 12px; + color: #fff; + background-color: rgba(0, 0, 0, 0.5); + left: 16px; + font-size: 14px; + line-height: 24px; + //opacity: 0; + transition: bottom 2s ease 0s; } - img { - width: 100%; - height: 100%; - object-fit: fill; + } + img { + width: 100%; + height: 100%; + object-fit: fill; + cursor: pointer; + } + .arrow { + opacity: 0; + position: absolute; + cursor: pointer; + color: #fff; + font-size: 60px; + border-radius: 30px; + position: absolute; + top: 50%; + transform: translateY(-50%); + background-color: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + color: #fff; + text-align: center; + line-height: 60px; + &:hover { + color: #409eff; } } - .swiper-button-prev.swiper-button-disabled, - .swiper-button-next.swiper-button-disabled { - opacity: 0.35; - cursor: auto; - pointer-events: none; - display: none !important; + .leftArrow { + left: 16px; + } + .rightArrow { + right: 16px; } } - .gallery-thumbs { + .picBottom { width: 100%; height: 18%; - .slide { - width: 20%; - border: 3px solid transparent; - overflow: hidden; - box-sizing: border-box; + position: relative; + .smallPicBox { + width: 100%; + height: 100%; display: flex; - align-items: center; justify-content: center; - - .bigimg { - width: 100%; - height: 100%; + li { + width: 20%; + border: 3px solid transparent; + // overflow: hidden; + box-sizing: border-box; display: flex; align-items: center; justify-content: center; + position: relative; + img { + width: 100%; + height: 100%; + object-fit: fill; + cursor: pointer; + } + .smallhavePic { + width: 100%; + height: 100%; + } + .smallnoPic { + width: 100%; + height: 100%; + } + } + .borderActive { + border: 3px solid #409eff; + &::after { + content: ""; + position: absolute; + width: 0; + height: 0; + left: 50%; + top: -16px; + margin-left: -8px; + border-bottom: 13px solid #409eff; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + } } - img { - //width: 100%; - height: 100%; - object-fit: fill; + .timeInfo { + position: absolute; + bottom: 0px; + width: 100%; + background: #f0f0f0; + padding: 8px 0px; + font-size: 12px; + text-align: center; + color: #333; } } - - .timeInfo { + .arrow { position: absolute; - bottom: 0px; - width: 100%; - background: #f0f0f0; - padding: 8px 0px; - font-size: 12px; + cursor: pointer; + color: #fff; + font-size: 30px; + border-radius: 30px; + position: absolute; + top: 45%; + transform: translateY(-50%); + background-color: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + color: #fff; text-align: center; - color: #333; + line-height: 60px; + } + .leftArrow { + left: 16px; + } + .rightArrow { + right: 16px; } - } - - .swiper-button-next.swiper-button-white, - .swiper-container-rtl .swiper-button-prev.swiper-button-white, - .swiper-button-prev.swiper-button-white, - .swiper-container-rtl .swiper-button-next.swiper-button-white { - width: 40px; - height: 40px; - border-radius: 30px; - position: absolute; - top: 50%; - transform: translateY(-50%); - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - font-size: 30px; - color: #fff; - text-align: center; - line-height: 60px; - } - .swiper-button-next:after, - .swiper-container-rtl .swiper-button-prev:after, - .swiper-button-prev:after, - .swiper-container-rtl .swiper-button-next:after { - transform: scale(0.5); } } // https://v1.github.surmon.me/vue-awesome-swiper/ diff --git a/src/views/components/carouselChart1.vue b/src/views/components/carouselChartnew.vue similarity index 80% rename from src/views/components/carouselChart1.vue rename to src/views/components/carouselChartnew.vue index ffc40a1..49a58cd 100644 --- a/src/views/components/carouselChart1.vue +++ b/src/views/components/carouselChartnew.vue @@ -1,30 +1,20 @@