diff --git a/src/router/index.js b/src/router/index.js
index b4438d81e..66f344e46 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -98,6 +98,16 @@ export const moduleRoutes = {
],
},
},
+ {
+ path: "base-nonIntResi",
+ props: true,
+ name: "base-nonIntResi",
+ component: () => import("@/views/modules/base/nonIntResi/nonIntResi"),
+ meta: {
+ isTab: true,
+ title: "信息不完整",
+ },
+ },
{
path: "shequ-chaxun",
props: true,
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 08df9be1d..1e63e896f 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -93,88 +93,8 @@
@@ -203,10 +123,6 @@
-
{{ item.createdTime }}
@@ -215,7 +131,7 @@
style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">

{{
- item.content }}
+ item.content }}
@@ -232,38 +148,43 @@
-
居民分类更新情况
更新设置
-
-
-
-
-
- | 居民类别 |
- 总人数 |
- 分类信息不完整数 |
- 更新负责人 |
- 更新周期 |
- 更新人数 |
-
-
-
-
- | {{ item.residentCategoryName }} |
- {{ item.total }} |
- {{ item.nonIntegratedNum }} |
-
-
-
-
-
-
-
-
+
+
+
+ {{scope.row.residentCategoryName}}
+
+
+
+
+ {{scope.row.total}}
+
+
+
+
+ {{scope.row.nonIntegratedNum}}
+
+
+
+
+ {{scope.row.userName}}
+
+
+
+
+ {{scope.row.updatePeriod?scope.row.updatePeriod =='month'?'每自然月':scope.row.updatePeriod =='halfMonth'?'每半自然月':scope.row.updatePeriod =='week'?'每周':'':''}}
+
+
+
+
+ {{scope.row.updateResiNum}}({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})
+
+
+
@@ -370,8 +291,8 @@ export default {
},
computed: {
maxTableHeight() {
- // return this.clientHeight - 450;
- return 420;
+ const _h = this.clientHeight - 610 ;
+ return _h;
},
...mapGetters(["clientHeight"]),
},
@@ -468,12 +389,16 @@ export default {
this.borderH();
const level = localStorage.getItem('level');
console.log('Stored level:', level);
- if (level == 'district' || 'community') {
+ if (level == 'community') {
this.showAll = true
}
-
},
+ columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex == 3||columnIndex == 4||columnIndex == 5) {
+ return 'background:#fffcf3;'
+ }
+ },
borderH() {
this.$http.post("/actual/base/residentCategoryUpdateInfo/getUpdateAndintegrityList").then(({ data: { data } }) => {
@@ -620,7 +545,15 @@ export default {
this.$message.error(msg);
}
},
-
+ handelCLickJump(e){
+ this.$router.push({
+ path: "/main/base-nonIntResi",
+ query: {
+ resiCategory: e.residentCategory,
+ }
+ });
+ },
+
//加载组织数据
async getWarningList() {
const url = "/actual/base/resiCategory/categoryCountList";
@@ -747,9 +680,8 @@ export default {
this.myBarchart.setOption(option);
window.addEventListener("resize", this.handleWindowResize);
this.myBarchart.on("click", (e) => {
- console.log(e);
this.$router.push({
- path: "/main/base-nonIntResi-nonIntResi",
+ path: "/main/base-nonIntResi",
query: {
resiCategory: e.data.extraProperty,
}