From 371f2a2fe0ea7906916dce7bffce37ce97f48a49 Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Thu, 28 Sep 2023 14:19:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=BB=9A=E5=8A=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/dataBoard/overview/index.scss | 16 +++++- src/assets/scss/dataBoard/renfang/index.scss | 2 +- .../dataBoard/overview/components/sq12345.vue | 49 ++++++++++--------- .../dataBoard/overview/components/sqrfph.vue | 49 ++++++++++--------- 4 files changed, 66 insertions(+), 50 deletions(-) diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index 1878a00e1..c4537482c 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -41,7 +41,21 @@ .m-subbox { @include scrollBar; height: 334px; - overflow-y: auto; + overflow-y: hidden; +} + +.animation { + animation: move 10s linear infinite; +} + +@keyframes move { + 0% { + transform: translateY(0px); + } + + 100% { + transform: translateY(-320px); + } } .m-jdjs { diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index 5f277248e..d9543ccb9 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -325,7 +325,7 @@ .m-subbox { @include scrollBar; height: 423px; - overflow-y: auto; + // overflow-y: auto; } .m-szsq { diff --git a/src/views/dataBoard/overview/components/sq12345.vue b/src/views/dataBoard/overview/components/sq12345.vue index bbbc092f8..a70babc86 100644 --- a/src/views/dataBoard/overview/components/sq12345.vue +++ b/src/views/dataBoard/overview/components/sq12345.vue @@ -8,14 +8,28 @@
处理中
已办结
-
-
- {{ index - 0 + 1 }} +
+
+
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.sumNum }}
+
{{ item.processNum }}
+
{{ item.closedNum }}
+
+ +
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.sumNum }}
+
{{ item.processNum }}
+
{{ item.closedNum }}
+
-
{{ item.orgName }}
-
{{ item.sumNum }}
-
{{ item.processNum }}
-
{{ item.closedNum }}
@@ -56,25 +70,12 @@ export default { }, methods: { getList(item) { - this.$http - .get( - "/actual/base/streetOverview/eventAgencyGroup?month=" + - this.date + - "&level=" + - item.orgLevel + - "&orgId=" + - item.orgId - ) - .then(({ data: { data } }) => { - this.pmList = data; - }); + this.$http.get("/actual/base/streetOverview/eventAgencyGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { + this.pmList = data; + }); }, }, }; - + diff --git a/src/views/dataBoard/overview/components/sqrfph.vue b/src/views/dataBoard/overview/components/sqrfph.vue index eabb2e974..18b4478b2 100644 --- a/src/views/dataBoard/overview/components/sqrfph.vue +++ b/src/views/dataBoard/overview/components/sqrfph.vue @@ -8,14 +8,28 @@
人口更新数
人房更新总数
-
-
- {{ index - 0 + 1 }} +
+
+
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.houseNum }}
+
{{ item.residentNum }}
+
{{ item.sumNum }}
+
+ +
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.houseNum }}
+
{{ item.residentNum }}
+
{{ item.sumNum }}
+
-
{{ item.orgName }}
-
{{ item.houseNum }}
-
{{ item.residentNum }}
-
{{ item.sumNum }}
@@ -56,25 +70,12 @@ export default { }, methods: { getList(item) { - this.$http - .get( - "/actual/base/streetOverview/residentHouseUpdateGroup?month=" + - this.date + - "&level=" + - item.orgLevel + - "&orgId=" + - item.orgId - ) - .then(({ data: { data } }) => { - this.pmList = data; - }); + this.$http.get("/actual/base/streetOverview/residentHouseUpdateGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { + this.pmList = data; + }); }, }, }; - + From 3be54ea307f05151474ba7014f4469126858380d Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Thu, 28 Sep 2023 16:44:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E4=B8=8B=E6=8B=89=E6=A1=86=E5=B1=95=E7=A4=BA=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=BD=91=E6=A0=BC=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E4=B8=8D=E5=85=81=E8=AE=B8=E7=82=B9=E5=87=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + src/views/dataBoardMain/main-navbar.vue | 47 ++++++++++++++++++------- vue.config.js | 6 ++-- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/.env.development b/.env.development index 316568064..a3e8ed2df 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NODE_ENV=development VUE_APP_API_SERVER = http://localhost:9001/api +# VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://219.146.91.110:30801/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue index 7bd6c126f..ad7f321a4 100644 --- a/src/views/dataBoardMain/main-navbar.vue +++ b/src/views/dataBoardMain/main-navbar.vue @@ -6,7 +6,7 @@
{{ customerName }}数据智能分析平台
- +
- +
- - - - - - - + + + + + + + - - + + + + -