From f20008ef673a58a581f070d034ff1bf4b4e92c15 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 20 Jun 2025 08:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/assets/styles/index.scss | 41 ++++++++++++----- src/views/pageFive/index.vue | 5 +++ src/views/pageOne/index.vue | 87 ++++++++++++++++-------------------- 4 files changed, 73 insertions(+), 62 deletions(-) diff --git a/.env.development b/.env.development index 41e54d6..b8d45d3 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # 接口地址 # 许镇-本地服地址 -VUE_APP_BASE_API = 'http://192.168.99.67:8080' +VUE_APP_BASE_API = 'http://192.168.99.72:8080' # VUE_APP_BASE_API = 'http://27.19.209.92:13244' VUE_APP_LIB_API = 'http://118.253.150.248:8099' diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index e46719e..2666fe2 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -735,7 +735,7 @@ .inLib-num{ display: flex; - justify-content: space-between; + justify-content: center; align-items: center; flex-wrap: nowrap; padding: .625rem .125rem 0 0; @@ -746,6 +746,20 @@ background: url('~@/assets/images/database-icon1.png') no-repeat left top; background-size: 100% 100%; } + .totayTotal{ + display: flex; + flex-direction: column; + justify-content: center; + // align-items: center; + flex-wrap: wrap; + margin-left: -.38rem; + // width: 100%; + height: 1.52rem; + padding-left: 2rem; + background: url('~@/assets/images/map_03.png') no-repeat left top; + // background-size: 5.58rem 1.1rem; + background-size: 1.9rem 1.52rem; + } .currentNum, .lastYearTotal{ width: 50%; @@ -759,7 +773,7 @@ display: inline-block; width: .28rem; height: 100%; - line-height: 0.15rem; + line-height: .38rem; overflow: hidden; writing-mode: vertical-lr; text-orientation: upright; @@ -781,20 +795,21 @@ .pageLeft-flop-box { position: relative; - height: .325rem; - margin-top: .125rem; + height: .63rem; + margin-top: .25rem; overflow: hidden; & div:first-child { - height: .325rem; + height: .63rem; overflow: hidden; display: flex; align-items: center; justify-content: flex-start; } .flop-figure { - width: .325rem; + width: .5rem; i { - font-size: .3rem; + // font-size: .3rem; + font-size: .63rem; font-weight: bold; } } @@ -817,11 +832,13 @@ font-size: .175rem; font-weight: bold; color: #A8CBF6; - height: .375rem; + height: .23rem; } } .flop-item-name{ - font-size: .225rem; + font-size: .25rem; + // text-align: right; + // padding-right: .3rem; } // 左边进度条 @@ -829,10 +846,10 @@ display: flex; justify-content: space-between; flex-wrap: wrap; - padding: 0 .25rem 0 .38rem; + padding: 0 .25rem; li{ position: relative; - width: 2.38rem; + width: 2.5rem; font-size: .225rem; padding-left: .1625rem; margin-top: .7rem; @@ -853,7 +870,7 @@ position: absolute; right: 0; top: 0; - font-size: .3rem; + font-size: .28rem; font-weight: bold; color: #fff; background: -webkit-linear-gradient(to bottom, #fff 40%, #69A4D6 60%); diff --git a/src/views/pageFive/index.vue b/src/views/pageFive/index.vue index eb6f5fe..ecc9db3 100644 --- a/src/views/pageFive/index.vue +++ b/src/views/pageFive/index.vue @@ -5,6 +5,7 @@ indicator-position="none" :autoplay-hover-pause="true" :interval="5000" + @mouseenter.native="delHandleMouseEnter" >
@@ -48,6 +49,9 @@ export default { this.getInitImgData() }, methods: { + delHandleMouseEnter() { + this.$refs.carousel.handleMouseEnter = () => { } + }, getInitImgData() { const params = { 'branchId': '1' @@ -63,6 +67,7 @@ export default { } return item }) + this.delHandleMouseEnter() }).catch(error => { console.error('Error', error) }) diff --git a/src/views/pageOne/index.vue b/src/views/pageOne/index.vue index ecfa48a..0fe1620 100644 --- a/src/views/pageOne/index.vue +++ b/src/views/pageOne/index.vue @@ -8,7 +8,7 @@
  • @@ -31,41 +31,10 @@
    -
    -
    @@ -85,7 +54,6 @@
  • 0123456789 {{ e }} -
    • @@ -306,9 +274,14 @@ export default { this.progressData = [] this.leftData = [] this.progressData.push( + // { + // name: '今日到馆', + // value: result.todayVisitBase, + // type: 1 + // }, { - name: '今日到馆', - value: result.todayVisitBase, + name: '本年到馆', + value: result.visitBase, type: 1 }, { @@ -316,9 +289,14 @@ export default { value: result.thisMonthVisitBase, type: 2 }, + // { + // name: '昨日到馆', + // value: result.yesterdayVisitBase, + // type: 3 + // }, { - name: '昨日到馆', - value: result.yesterdayVisitBase, + name: '去年到馆', + value: result.lastYearVisitBase, type: 3 }, { @@ -328,18 +306,29 @@ export default { } ) - this.leftData.push({ - id: 'allTotal', - name: '本年累计到馆', - value: this.$parent.formatter(result.visitBase), - valueArr: this.$parent.formatter(result.visitBase).split('') - }, - { - id: 'lastYearTotal', - name: '去年累计到馆', - value: this.$parent.formatter(result.lastYearVisitBase), - valueArr: this.$parent.formatter(result.lastYearVisitBase).split('') - }) + this.leftData.push( + { + // name: '今日到馆', + // value: result.todayVisitBase, + // type: 1 + id: 'totayTotal', + name: '今日到馆', + value: this.$parent.formatter(result.todayVisitBase), + valueArr: this.$parent.formatter(result.todayVisitBase).split('') + } + // { + // id: 'allTotal', + // name: '本年累计到馆', + // value: this.$parent.formatter(result.visitBase), + // valueArr: this.$parent.formatter(result.visitBase).split('') + // }, + // { + // id: 'lastYearTotal', + // name: '去年累计到馆', + // value: this.$parent.formatter(result.lastYearVisitBase), + // valueArr: this.$parent.formatter(result.lastYearVisitBase).split('') + // } + ) this.$parent.timedRefresh(this.leftData, 'left') },