From 1390a8d10d405b994416c001f8d13dd5fd06e1dd Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 4 May 2023 16:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/element.less | 4 + src/assets/css/theme.less | 28 ++-- src/assets/font/iconfont.ttf | Bin 1916 -> 0 bytes src/assets/{font => fonts}/iconfont.css | 14 +- src/assets/fonts/iconfont.ttf | Bin 0 -> 4436 bytes src/components/common/Sidebar.vue | 31 +++-- src/main.js | 2 +- src/router/index.js | 8 ++ src/utils/api/index.js | 126 ++---------------- src/views/components/carouselChart.vue | 22 +-- .../components/setdevice.vue | 12 +- src/views/imageSettings/index.vue | 104 +++++++++++++++ .../components/addPhotoDialog.vue | 4 +- .../components/setschedule.vue | 51 +++++-- src/views/realTimeMonitor/index.vue | 48 +++++-- 15 files changed, 280 insertions(+), 174 deletions(-) delete mode 100644 src/assets/font/iconfont.ttf rename src/assets/{font => fonts}/iconfont.css (59%) create mode 100644 src/assets/fonts/iconfont.ttf create mode 100644 src/views/imageSettings/index.vue diff --git a/src/assets/css/element.less b/src/assets/css/element.less index beb9471..28a9bb3 100644 --- a/src/assets/css/element.less +++ b/src/assets/css/element.less @@ -21,6 +21,10 @@ .deleteText { color: #f56c6c; } + .deleteText:focus, + .deleteText:hover { + color: #f56c6c; + } } .el-table::before, .el-table__fixed-right::before, diff --git a/src/assets/css/theme.less b/src/assets/css/theme.less index 1216700..0a3f412 100644 --- a/src/assets/css/theme.less +++ b/src/assets/css/theme.less @@ -15,10 +15,6 @@ color: @color-white; } - .el-menu-item.is-active { - color: @color-white; - } - .el-submenu .el-submenu__title { color: @color-white; } @@ -44,12 +40,28 @@ color: #20a0ff !important; } } - - .el-submenu.is-active .el-submenu__title { - color: @color-white; + } + .el-menu--horizontal > .el-menu-item.is-active { + border-bottom: 2px solid #fff; + color: #20a0ff; + background-color: #fff; + i { + color: #20a0ff !important; } } - + .el-submenu.is-active { + .el-submenu__title { + border-bottom: 2px solid #fff !important; + color: #20a0ff !important; + background-color: #fff; + i { + color: #20a0ff !important; + } + } + } + .gallery-thumbs .swiper-slide-active { + border: 3px solid #20a0ff !important; + } .tags-li.active { border: 1px solid #20a0ff; background-color: #20a0ff; diff --git a/src/assets/font/iconfont.ttf b/src/assets/font/iconfont.ttf deleted file mode 100644 index 09cdb6963f973492fff41b2e0cf4bce607408c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1916 zcmd^A-D@0G6hC)nc4l@r+3a?kY)G1BHru3rl-*?47*q05j7>->sA&v7NSo>I>_;;D z!Dbq|QE)*KjY92<4+^Ca2=zt8`kinq^W2l#oBeA<>k4^O~lt>t3~}{g@x%P);nQqCB0|_H^x3BlD3G1T&28XZG6?*MWl>jeUebSSZ~zn z1qmit2(-byNwhuiu5GSwoNF8Vll%_%W=8&*(;VHnDv>x3QzgL-=9xqqCE2#Q*M~o% zhHX1L`Dlp05qq0FIO`k2 zcUZmTX!Z*w86pMpi10pOJd-_{p&PencP`ugAn_-vgT`~-8v@_3DS+4qCnP%NxY=2k z|2(`r@)$Hu48LS^WN1bL-=%>rG&Pv~1iVjJ#pHAh=Kpv&*Zd*31L(@_Sx0zhcP=|} z_pb480G!5EF^XH*!@C{nI~r#r;aK0mNO*#!qRGSTpdzNAWQED$WJeogvA#Ha3>@(v zui{swcV7%0l)slkes(|&dOaU}>XlHBfRtKC7i<@Kq7 zkh=GmHyBoSzwoo|uD0LUn%Wjpm~Su7f78Yt@dPf(06mPV5|kpm3@q8v%Tn#J2&6sI z5nu_X1Q_a_WW%xH)CiXe6t6`3l}Q$jgkwrnj47$3!c^xGIl8voYc7tf-NT)qf6~$u z=7tP+~wWz1B{g2|6z1q-~t-Y;xGT+2lU?CmdjEZ!)bNxj9gm~*vD%kq+OR6NP zsYAC!xYi>*!tR~frR&$1E*Y%9&PHoB-t+^s%{y(6FlGnyuPy9iffVX?u?T;kizVPk zTvYL9%$Xzh?YSV1$1*5uBD3`RM z_+ZmDW0Z_)GtJ6sE@@d=En6)YwQ1xtOtY+2s^ujkZN>AJRXLtW@O`*Ho-P+@imGIg zP8Q}2X>^`ymBG9y3pMgqDU=2SYUt2<+G}v*<+ffxdjw_$Id!8mgZlANr gA7p3n{|gTqA`_U%B$6`)y<`?z9F^Bgxtam~zd+O)2mk;8 diff --git a/src/assets/font/iconfont.css b/src/assets/fonts/iconfont.css similarity index 59% rename from src/assets/font/iconfont.css rename to src/assets/fonts/iconfont.css index e068e4b..e5912cc 100644 --- a/src/assets/font/iconfont.css +++ b/src/assets/fonts/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1681806954677') format('truetype'); + src: url('iconfont.ttf?t=1683175912652') format('truetype'); } .iconfont { @@ -11,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-gongsi:before { + content: "\e62e"; +} + .icon-dianli:before { content: "\e649"; } @@ -19,3 +23,11 @@ content: "\e791"; } +.icon-video-camera:before { + content: "\e962"; +} + +.icon-shudianxianlu_2722010801:before { + content: "\efed"; +} + diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..6cd3db663b9162ee6bedb18cdd040a67c21094c1 GIT binary patch literal 4436 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
@@ -74,22 +65,23 @@ export default { data() { return { swiperOptionTop: { - // loop: true, - loopedSlides: 5, // looped slides should be the same spaceBetween: 10, + //loop: true, + freeMode: true, + // loopedSlides: 4, navigation: { nextEl: ".swiper-button-next", prevEl: ".swiper-button-prev", }, }, swiperOptionThumbs: { - //loop: true, - loopedSlides: 5, // looped slides should be the same spaceBetween: 10, centeredSlides: true, slidesPerView: "auto", touchRatio: 0.2, slideToClickedSlide: true, + //loop: true, + //loopedSlides: 4, }, }; }, @@ -171,7 +163,7 @@ export default { padding: 8px 0px; font-size: 14px; text-align: center; - color: @color-text-primary; + color: #333; } } diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 040b9bd..e6705fe 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -4,7 +4,7 @@ title="设置" :visible.sync="isShow" :close-on-click-modal="false" - width="40%" + width="480px" > - 否 是 @@ -103,7 +102,7 @@ export default { { required: true, message: "请输入杆塔编号", trigger: "blur" }, ], hasPan: [ - { required: true, message: "请输入是否带云台", trigger: "blur" }, + { required: true, message: "请输入是否带云台", trigger: "change" }, ], // equipName: [ @@ -160,6 +159,7 @@ export default { console.log(res); this.$emit("photoDialogClose", 1); //关闭弹窗 this.formArr = []; + this.$message.success("添加成功"); }) .catch((err) => { diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 4795ce3..4595c95 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -4,10 +4,10 @@ title="时间表设置" :visible.sync="isShow" :close-on-click-modal="false" - width="60%" + width="680px" > - - + +
通道:
@@ -65,7 +65,7 @@ label="备注" show-overflow-tooltip > - +