diff --git a/src/assets/img/shuju/measure/qydw.png b/src/assets/img/shuju/measure/qydw.png index bb4674f9..aa10d299 100644 Binary files a/src/assets/img/shuju/measure/qydw.png and b/src/assets/img/shuju/measure/qydw.png differ diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index ae6c6a6c..7f9c9132 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -207,10 +207,10 @@ .cnt { display: flex; .chart { - width: 500px; + width: 520px; } .tb { - width: calc(100% - 500px); + width: calc(100% - 520px); } } } diff --git a/src/router/index.js b/src/router/index.js index eb545fb4..54c903b5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,7 +52,7 @@ export const moduleRoutes = { component: () => import("@/views/main"), name: "main", redirect: { - path: "/main/base-resi", + path: "/main/shequ-index", }, meta: { title: "主入口布局", diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 8437ba9d..becf35d4 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -378,7 +378,7 @@
- {{ item }} +
+ + {{ rIndex != 0 ? "、" : "" }} + {{ resi.residentName }} + +
+ {{ item }} 更多> - - - {{ item }} - +
+ + {{ rIndex != 0 ? "、" : "" }} + {{ + resi.residentName + }} + +
@@ -185,7 +194,7 @@ export default { methods: { toUserInfo(uid) { - // this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); + this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, onClickMorePop(index) { @@ -245,6 +254,9 @@ export default { .td { text-align: center; width: calc(100% / 5); + a { + cursor: pointer; + } .more { font-size: 18px; font-weight: 400; diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue index 8afcae22..587263ba 100644 --- a/src/views/modules/visual/warning/index.vue +++ b/src/views/modules/visual/warning/index.vue @@ -133,7 +133,7 @@ export default { item.gridName, item.neighborhoodName, item.buildingName, - item.residentNames ? item.residentNames : "暂无", + item.userList, ]); }); this.tableData = tableData;