From b3f975394fc1f79816cf76363d011ec18c72d3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Sun, 8 Oct 2023 18:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=92=8Cbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/overview/dia_con.png | Bin 0 -> 1142 bytes src/assets/images/overview/dia_foot.png | Bin 0 -> 3603 bytes src/assets/images/overview/dia_head.png | Bin 0 -> 4097 bytes src/assets/scss/dataBoard/overview/index.scss | 10 ++--- src/assets/scss/dataBoard/table.scss | 1 + src/router/index.js | 4 +- src/views/dataBoard/cpts/map/index.vue | 39 ++++++++++++++---- .../dataBoard/overview/components/jdwgy.vue | 7 +++- .../dataBoard/overview/components/map-top.vue | 2 +- .../overview/familyPortrait/index.vue | 2 +- src/views/dataBoard/overview/index.vue | 2 +- .../dissatisfiedPersonnel/detail.vue | 2 +- .../dissatisfiedPersonnel/index.vue | 4 +- .../modules/EventStatistics/index.vue | 15 ++++++- 14 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 src/assets/images/overview/dia_con.png create mode 100644 src/assets/images/overview/dia_foot.png create mode 100644 src/assets/images/overview/dia_head.png diff --git a/src/assets/images/overview/dia_con.png b/src/assets/images/overview/dia_con.png new file mode 100644 index 0000000000000000000000000000000000000000..fc87370cd31cca6561f6838e7e6dfd0355a0e636 GIT binary patch literal 1142 zcmaJ>TSyd97@jCo7L1B03WH&!sBmX?W}Vd?b~D{sbEy$sSF|3=apvd_I&;REv+cT& zMN|+(5EWtd5JA*~8sST6VNa3xpavpVVA0L)MRcJa>WsP8gWEj(^Pe-{_x+dipE*`j zy*=Nx&P5PJexyo_62zj5*k7Hu6x*ZstB&B;S`=X?#lQ~WAbwv`N|1T3HfB$Fw<-LQpJkebyMuvgj}q1YpE969$;IGUxl2vMVl1_SQXtgq|-|uHU9K&&LjBwkX29i^5!!FDyh`?4X%|seBNJmj_h6xm; zaHfAs(9L;S!=7ssZWxo2O@^gCPDvS{B>f+%>+@(EMZw>E7ZkQ*ohD$Sz=jD+!3Wn; z=!7zbkOgD}tr&#unJ(7EA%b=snq(;Cbj?q0YS0W7Chg6$97z%)hK*!H0TD4sVHH}_ zRKZ)yi^bkb(Z`3pEE^72ggLR4FX36QSmCH-xFS>%IxtX%tN!JNvvQqr&`lg!1eUfB zsFfDf$=R|6Eqg8%S@q_)YW7@0S-A{OhH(z}pTo{<;R$lw`O(FT`QZl!o_Gt7_RPoJ zANX3lh=}E})PuJZ*QLef%X7xMpD!yoIktqaB`(*VI=`)I$-Sojk)98n>)_+ytG0c& zzUHj?-WnL%|LoKA(^n?H%@kfbaAM}Ad)n@*rxSh0N8)E5JWZFq&V5>Ndvr>9_{KPX z?n}?r(e#FEJEn4pU$OTGCcDRXuiujBQJ+QoC)yMI%Yk=#Z_&8jJw1G5*NZ(jdp{3M zk3OpB?ml_a71+A|+}Zp)duz54n@D2S@~qaC=X_nzcKuw@L<}B|BrmM=bvS>5NVr<; It7tm(8{lbn;{X5v literal 0 HcmV?d00001 diff --git a/src/assets/images/overview/dia_foot.png b/src/assets/images/overview/dia_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..837f274bad16e1967e3456a6bda2bacccf6758ad GIT binary patch literal 3603 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 EH~CXGYXATM literal 0 HcmV?d00001 diff --git a/src/assets/images/overview/dia_head.png b/src/assets/images/overview/dia_head.png new file mode 100644 index 0000000000000000000000000000000000000000..0b651f1b5fee7e3e73c770ad040e258b079d8535 GIT binary patch literal 4097 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 import("@/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index"), name: "dataBoard-satisfactionEval-dissatisfiedPersonnel", meta: { - title: "画像匹配同类不满意人员", + title: "画像匹配同类潜在不满意人员 ", isTab: false, }, }, @@ -527,7 +527,7 @@ export const dataBoardRoutes = { component: () => import("@/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail"), name: "dataBoard-satisfactionEval-dissatisfiedPersonnel-detail", meta: { - title: "画像匹配同类不满意人员", + title: "画像匹配同类潜在不满意人员 ", isTab: false, }, }, diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index ff820143e..11a629a17 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -797,7 +797,6 @@ export default { name: 'pointMarker' }) for (let i in data) { - console.log(data[i].longitude * 1, data[i].latitude * 1) var el = document.createElement('div'); el.className = 'label-point-class'; el.classList.add(data[i].type) @@ -988,13 +987,37 @@ export default { /deep/ .l7-popup-content { //background: rgba(#fff, 1); - background: rgba(3, 31, 73, 0.72); - border: 1px solid #74C9FF; - opacity: 0.9; - border-radius: 5px; + //background: rgba(3, 31, 73, 0.72); + //border: 1px solid #74C9FF; + //opacity: 0.9; + //border-radius: 5px; color: #fff; - box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1); + //box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1); width: 416px; + padding: 0 20px !important; + background: url('@/assets/images/overview/dia_con.png'); + + &:before { + content: ''; + display: block; + background: url('@/assets/images/overview/dia_head.png'); + height: 29px; + width: 100%; + position: absolute; + top: -27.5px; + left: 0; + } + + &:after { + content: ''; + display: block; + background: url('@/assets/images/overview/dia_foot.png'); + height: 26px; + width: 100%; + left: 0; + position: absolute; + bottom: -24px; + } } /deep/ .l7-popup-close-button { @@ -1118,8 +1141,8 @@ export default { flex-wrap: wrap; & > div { - flex: 0 0 131px; - width: 131px; + flex: 0 0 33%; + width: 33%; height: 14px; font-size: 14px; font-weight: 400; diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index 403758083..83044f1a1 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -1,8 +1,8 @@