diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue new file mode 100644 index 00000000..1f2d19a2 --- /dev/null +++ b/src/views/components/checkBox.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/dragItem.vue b/src/views/components/dragItem.vue new file mode 100644 index 00000000..c9268ac9 --- /dev/null +++ b/src/views/components/dragItem.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue new file mode 100644 index 00000000..ec4a3eb3 --- /dev/null +++ b/src/views/modules/base/diyInfo.vue @@ -0,0 +1,463 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 5ffed18a..391035b1 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -63,6 +63,10 @@ class="diy-button--reset" :loading="exportBtn" @click="handleExport">{{exportBtnTitle}} + 自定义导出 + + + { + (async (id) => { + item.queryItemList = await this.getExportChildList(id) + })(item.id) + }) + this.exportList = [...data] + this.$nextTick(() => { + this.diyDialog = true + }) + console.log('获取详情成功getExportList----', this.exportList) + + } else { + this.$message.error(msg) + } + }, + async getExportChildList (groupId) { + const url = `/oper/customize/icformitem/getItemList/${groupId}` + let params = {} + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + + return data + + } else { + this.$message.error(msg) + } + }, async deleteresiBatch () { if (this.selection.length === 0) return this.$message.error('请选择之后进行操作') let userIds = this.selection.map(item => item.icResiUserId) diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index da717e6b..ce085141 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -17,7 +17,7 @@
- 人房概览统计 + 人房概览数据统计
@@ -116,70 +116,73 @@ - -
下级人房概览数据统计
- -
-
-
- - {{item.orgName}} -
- -
-
-
-
{{item.houseTotal}}
-
房屋总数
-
-
-
-
{{item.zzHouseTotal}}
-
{{item.zzHouseRatio+'%'}}
-
自住房屋数
-
-
-
{{item.czHouseTotal}}
-
{{item.czHouseRatio+'%'}}
-
出租房屋数
-
-
-
{{item.xzHouseTotal}}
-
{{item.xzHouseRatio+'%'}}
-
闲置房屋数
-
+
+ +
下级人房概览数据统计
+ +
+
+
+ + {{item.orgName}}
-
-
-
{{item.userTotal}}
-
居民总数
-
-
-
-
{{item.czUserTotal}}
-
{{item.czUserRatio+'%'}}
-
常住人口数
-
-
-
{{item.ldUserTotal}}
-
{{item.ldUserRatio+'%'}}
-
流动人口数
+ +
+
+
+
{{item.houseTotal}}
+
房屋总数
+
+
+
+
{{item.zzHouseTotal}}
+
{{item.zzHouseRatio+'%'}}
+
自住房屋数
+
+
+
{{item.czHouseTotal}}
+
{{item.czHouseRatio+'%'}}
+
出租房屋数
+
+
+
{{item.xzHouseTotal}}
+
{{item.xzHouseRatio+'%'}}
+
闲置房屋数
+
+
+
+
{{item.userTotal}}
+
居民总数
+
+
+
+
{{item.czUserTotal}}
+
{{item.czUserRatio+'%'}}
+
常住人口数
+
+
+
{{item.ldUserTotal}}
+
{{item.ldUserRatio+'%'}}
+
流动人口数
+
+
-
-
+
+ + - +
diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js index 5b7e5f5e..fec2c520 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/options.js +++ b/src/views/modules/visual/basicinfo/houseStatic/options.js @@ -1,10 +1,10 @@ export function housePieOption (_charts) { - const center= ['50%', '150px'] + const center= ['50%', '200px'] return { title: { text: '0', - top: 120, + top: 170, left: 'center', textStyle: { width: '100%', diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js index 54129ff2..bd6bca77 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js +++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js @@ -1,10 +1,10 @@ export function userPieOption (_charts) { - const center= ['50%', '150px'] + const center= ['50%', '200px'] return { title: { text: '0', - top: 120, + top: 170, left: 'center', textStyle: { width: '100%', @@ -13,7 +13,7 @@ export function userPieOption (_charts) { fontWeight: 400 }, itemGap: 5, - subtext: '房屋总数', + subtext: '居民总数', subtextStyle: { fontSize: 20, color: '#fff',