diff --git a/src/assets/images/shuju/main/back1.png b/src/assets/images/shuju/main/back1.png new file mode 100644 index 000000000..289a41f72 Binary files /dev/null and b/src/assets/images/shuju/main/back1.png differ diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss index e9a71e469..735937384 100644 --- a/src/assets/scss/dataBoardMain.scss +++ b/src/assets/scss/dataBoardMain.scss @@ -66,29 +66,33 @@ left: 60px; right: 0; top: 0; - line-height: 82px; - font-family: PingFang SC; - font-weight: bold; - color: #FFFFFF; - font-size: 34px; - // text-shadow: 0px 4px 3px rgba(18, 27, 70, 0.51); - background: linear-gradient(0deg, #8FD4FF 0%, #FFFFFF 64.0380859375%); - background-clip: text; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; + display: flex; + &-txt { + line-height: 82px; + font-family: PingFang SC; + font-weight: bold; + color: #FFFFFF; + font-size: 34px; + // text-shadow: 0px 4px 3px rgba(18, 27, 70, 0.51); + background: linear-gradient(0deg, #8FD4FF 0%, #FFFFFF 64.0380859375%); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + + } } .selectArea { - position: absolute; - left: 680px; + // position: absolute; + // left: 680px; width: 120px; - right: 0; - top: 20px; + padding-left: 15px; + margin-top: 26px; ::v-deep .el-input__inner { height: 32px !important; border-radius: 16px !important; - border: none !important; + border: 1px solid #125AAA !important; color: #fff !important; background: linear-gradient(180deg, #05326E 0%, #032A5D 100%) !important; } diff --git a/src/router/index.js b/src/router/index.js index a6090f905..6f93f324e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -258,7 +258,8 @@ export const dataBoardRoutes = { title: "居民画像", isTab: false, }, - },, + }, + , { path: "overview/familyPortrait", props: true, @@ -455,10 +456,11 @@ export const dataBoardRoutes = { path: "/homeDetails/index", props: true, component: () => import("@/views/dataBoard/cpts/homeDetails/index"), - name: "homeDetails", + name: "HomeDetails", meta: { title: "单元", isTab: false, + keepAlive: false, }, }, { diff --git a/src/views/components/fixed1920.vue b/src/views/components/fixed1920.vue index 46341a169..0fc13df29 100644 --- a/src/views/components/fixed1920.vue +++ b/src/views/components/fixed1920.vue @@ -18,7 +18,7 @@ export default { computed: { bdStyle() { const { clientHeight, clientWidth } = this; - console.log("clientHeight", clientHeight); + // console.log("clientHeight", clientHeight); const scale = clientWidth / 1920; const height = clientHeight / scale; const top = (clientHeight - height) / 2; diff --git a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue index e412c560f..32f6b78bf 100644 --- a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue +++ b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue @@ -1,36 +1,12 @@ @@ -123,9 +99,7 @@ export default { this.type = e; }, changeTotal(item) { - this.typeList[item.name].label = item.total - ? `${this.typeLists[item.name].label}(${item.total})` - : this.typeLists[item.name].label; + this.typeList[item.name].label = item.total ? `${this.typeLists[item.name].label}(${item.total})` : this.typeLists[item.name].label; }, }, }; @@ -139,15 +113,14 @@ export default { } .table { /deep/ .el-table td, - /deep/ .el-table th, /deep/ .el-table tr { - padding: 14px !important; + padding: 3px 14px !important; border: none !important; - min-height: 52px; } - /deep/ .el-table td, /deep/ .el-table th { background: none !important; + padding: 6px 14px !important; + border: none !important; } /deep/ .el-table td { font-size: 14px; diff --git a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue index 7f028803a..06868b2fa 100644 --- a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue +++ b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue @@ -1,6 +1,6 @@ + @@ -221,9 +281,36 @@ export default { font-weight: 500; } +@mixin navListCommon { + min-width: 120px; + height: 36px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + margin-right: 4px; + text-align: center; + line-height: 36px; + cursor: pointer; +} + +.top-nav-list { + display: flex; + margin-bottom: 16px; + .top-nav-item { + @include navListCommon; + background-image: url("~@/assets/images/home/noChooseMain.png"); + color: #96b1ce; + } + .top-nav-itemAC { + @include navListCommon; + background-image: url("~@/assets/images/home/chooseMain.png"); + color: #fff; + } +} + .homeWrap { .bread { - margin-bottom: 25px; + margin-bottom: 16px; } .apar_top { diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index 500d36d69..c8dbfad2c 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -841,7 +841,7 @@ export default { popup.remove(); }); pointMarkerItem.on("click", () => { - this.$router.push(`/homeDetails/index?id=${data[i].id}&type=${peopleType}`); + this.$router.push(`/homeDetails/index?id=${data[i].id}&typeB=${peopleType}`); }); pointMarker.addMarker(pointMarkerItem); diff --git a/src/views/dataBoard/overview/familyPortrait/index.vue b/src/views/dataBoard/overview/familyPortrait/index.vue index b6b32c79d..b1d9311a6 100644 --- a/src/views/dataBoard/overview/familyPortrait/index.vue +++ b/src/views/dataBoard/overview/familyPortrait/index.vue @@ -1,50 +1,56 @@ \ No newline at end of file + diff --git a/src/views/dataBoard/satisfactionEval/components/EventList/index.vue b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue index 252ea4f43..4ab7837db 100644 --- a/src/views/dataBoard/satisfactionEval/components/EventList/index.vue +++ b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue @@ -1,86 +1,71 @@