From 09d367a2b509742ed192730c91ea903fd473fedb Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 17 Nov 2021 10:35:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?icon=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/basicInfoMain.scss | 7 ++-- .../visual/basicinfo/basicInfoMain.vue | 38 ++----------------- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 1826d259..32154576 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -237,7 +237,7 @@ .item { background-color: #011168; margin-top: 12px; - width: 234px; + width: 244px; height: 190px; border: 1px solid #037ddc; border-radius: 8px; @@ -266,11 +266,12 @@ .icon_category { position: absolute; - bottom: 10px; + bottom: 14px; left: 9px; - margin-left: 9px; + // margin-left: 7px; > img { + margin-left: 5px; width: 21px; height: 20px; } diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index ffdb4201..8341e9a0 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -37,10 +37,6 @@ class="map"> --> -
-
-
{ - // 设置弹窗位置 - // 这里要设置定时器，不然弹窗首次出现，底图会跑偏 - that.currentCoordinate = hdms // 保存坐标点 - that.overlay.setPosition(coordinate) - - }, 0) // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); - }) //去除双击放大效果 @@ -755,7 +725,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { BasicInfoCommunity, PeopleSearch, People }, + components: { BasicInfoCommunity, PeopleSearch, People, cptCard }, } export default vueGis; From ec215073e0763d4fecef7c26a5ce85e916574858 Mon Sep 17 00:00:00 2001 From: FightingN <18300240052@163.com> Date: Wed, 17 Nov 2021 10:58:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/modules/visual/noData.png | Bin 0 -> 20286 bytes src/assets/scss/modules/visual/warning.scss | 7 +- src/views/modules/visual/warning/Base.js | 10 ++ .../components/screen-loading/index.vue | 68 +++++++++++++ .../warning/components/screen-table/index.vue | 72 ++++++++------ src/views/modules/visual/warning/index.vue | 90 +++++++++++++++--- 6 files changed, 204 insertions(+), 43 deletions(-) create mode 100644 src/assets/img/modules/visual/noData.png create mode 100644 src/views/modules/visual/warning/Base.js create mode 100644 src/views/modules/visual/warning/components/screen-loading/index.vue diff --git a/src/assets/img/modules/visual/noData.png b/src/assets/img/modules/visual/noData.png new file mode 100644 index 0000000000000000000000000000000000000000..e8fdcbcfec044c441d269f3a9a61e46a83e857e0 GIT binary patch literal 20286 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 m2+aL)&ZBso17`XE0t^80ltj52he2@w0000 +
+ + + + + + + + + + + +
+ +
+
+ + + + + diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue index d7eee309..4cbb392d 100644 --- a/src/views/modules/visual/warning/components/screen-table/index.vue +++ b/src/views/modules/visual/warning/components/screen-table/index.vue @@ -7,25 +7,34 @@
{{item}} - + 更多> - 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧 - 李易峰、赵敏、何军、曲树惠 + + {{item}}
+ 加载中 +
+ +
From 4421416cdb0452dbf6734b725d434f89e5c705b6 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 18 Nov 2021 13:29:09 +0800 Subject: [PATCH 3/5] ss --- src/views/modules/visual/basicinfo/cpts/people-more.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index e035760c..a634aade 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -323,7 +323,6 @@ export default { if (type == "cascader") { if (valueArr.length > 0) { let level1 = options.find((item) => item.value == valueArr[0]); - console.log("----------------------- cascader", options); if (level1) { if (valueArr.length > 1 && level1.children) { let level2 = level1.children.find( From 1228f878fde73da0e5dcfd368d4e394c4853c3f9 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 18 Nov 2021 15:06:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE-?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=AD=A6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/warning.scss | 46 ++-- src/router/index.js | 2 +- .../warning/components/screen-table/index.vue | 5 +- src/views/modules/visual/warning/index.vue | 205 ++++++++++-------- 4 files changed, 143 insertions(+), 115 deletions(-) diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss index 2a822bf6..36260a7f 100644 --- a/src/assets/scss/modules/visual/warning.scss +++ b/src/assets/scss/modules/visual/warning.scss @@ -2,10 +2,11 @@ box-sizing: border-box; // width: 1881px; width: 100%; - height: 914px; + // height: 100%; + min-height: 100%; margin: auto; color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat center; + // background: url("../../../img/modules/visual/warning-box.png") no-repeat center; background-size: 100% 100%; padding: 45px 21px 35px 24px; @@ -13,7 +14,8 @@ display: flex; // justify-content: space-around; justify-content: flex-start; - height: 190px; + flex-wrap: wrap; + min-height: 190px; .top-item { box-sizing: border-box; @@ -21,10 +23,11 @@ height: 190px; padding: 10px 22px 14px 21px; // background: rgba(255, 255, 255, 0); - border: 1px solid #1043C0; + border: 1px solid #1043c0; box-shadow: 0px 83px 150px 0px #002790; border-radius: 8px; margin-right: 15px; + margin-bottom: 15px; &-img { display: flex; @@ -34,6 +37,7 @@ width: 78px; height: 78px; margin-right: 16px; + margin-bottom: 10px; } .top-item-left { @@ -47,13 +51,13 @@ span:nth-child(1) { font-size: 18px; font-weight: 400; - color: #FFFFFF; + color: #ffffff; } span:nth-child(2) { font-size: 28px; font-weight: bold; - color: #00FFFC; + color: #00fffc; margin-top: 10px; } } @@ -76,13 +80,14 @@ align-items: center; justify-content: space-between; padding: 0 10px 0 29px; + cursor: pointer; &::after { display: block; - content: ''; + content: ""; width: 8px; height: 8px; - background: #F0F3F7; + background: #f0f3f7; border-radius: 50%; position: absolute; left: 12px; @@ -94,7 +99,7 @@ font-size: 16px; font-family: PingFang SC; font-weight: 400; - color: #FFFFFF; + color: #ffffff; } div:nth-child(2) { @@ -103,7 +108,7 @@ font-size: 20px; font-family: PingFang SC; font-weight: 500; - color: #FFFFFF; + color: #ffffff; .right-icon { width: 10px; @@ -113,7 +118,7 @@ } .num-item-active { - background: linear-gradient(0deg, #1A5AFD, #26C4FF); + background: linear-gradient(0deg, #1a5afd, #26c4ff); } .num-item:nth-child(2) { @@ -121,17 +126,15 @@ } } } - - } &-bottom { box-sizing: border-box; width: 100%; height: calc(100% - 300px); + min-height: 300px; margin-top: 60px; - .pagination { box-sizing: border-box; margin-top: 20px; @@ -141,24 +144,21 @@ justify-content: flex-end; /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { - background: #0266D1; - color: #000D3F; + background: #0266d1; + color: #000d3f; } /deep/ .el-pagination .el-pager li { - background: #002E74; + background: #002e74; } /deep/ .el-pagination .btn-prev { - background: #002E74; + background: #002e74; } /deep/ .el-pagination .btn-next { - background: #002E74; + background: #002e74; } } } - - - -} \ No newline at end of file +} diff --git a/src/router/index.js b/src/router/index.js index 74034c36..dbf8448e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -218,7 +218,7 @@ router.beforeEach((to, from, next) => { // }else{ http - .get("/oper/access/menu/nav") + .get("/gov/access/menu/nav") .then(({ data: res }) => { if (res.code !== 0) { // Vue.prototype.$message.error(res.msg) diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue index 4cbb392d..7b6dce78 100644 --- a/src/views/modules/visual/warning/components/screen-table/index.vue +++ b/src/views/modules/visual/warning/components/screen-table/index.vue @@ -137,6 +137,7 @@ mounted () { }, }; + + + diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue index 4eb670df..9c83dea4 100644 --- a/src/views/modules/workSys/resiCate.vue +++ b/src/views/modules/workSys/resiCate.vue @@ -1,7 +1,8 @@