diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue index 4dd5df7f1..16c58cc89 100644 --- a/src/views/modules/census/census-accountActiveList.vue +++ b/src/views/modules/census/census-accountActiveList.vue @@ -497,4 +497,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index 1c664b4e9..8b1772342 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -677,4 +677,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index e0de5e16c..ebb956575 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -48,8 +48,8 @@
房屋用途统计
- - +
+
- - +
+
-
+
-
{{ item.name }}
+
{{ index }}{{ item.name }}
{{ item.value }}
-
{{ item.radio }}%
+
{{ item.radio }}%
- - +
+
房屋状态统计
- - +
+
- - +
+
@@ -99,13 +99,13 @@
{{ item.name }}
{{ item.value }}
-
{{ item.radio }}%
+
{{ item.radio }}%
- - +
+
@@ -192,7 +192,7 @@ export default { return time.getTime() > nowData; }; return { - optionData:{}, + optionData: {}, dialogVisible: false, detailId: '', detailData: {}, @@ -233,7 +233,8 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252', '#F0D915', '#5DC7F0'], + color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -291,7 +292,7 @@ export default { }, async getTableData() { this.tableLoading = true; - + const url = '/gov/org/ichouse/getHousePictureList'; const { pageSize, pageNo, formData } = this; @@ -448,7 +449,7 @@ export default { color: '#fff' } }, - color: this.color, + color: this.color1, title: { text: this.pieData.total, subtext: '总数', @@ -552,7 +553,7 @@ export default { color: '#fff' } }, - color: this.color, + color: this.color2, title: { text: this.pieData2.total, subtext: '总数', @@ -714,7 +715,7 @@ export default { // const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]; // this.orgOptions = this.deepTree(_arr); this.orgOptions = []; - this.optionData=data; + this.optionData = data; this.orgOptions.push(data); this.orgId = data.agencyId; this.orgIdPath = data.orgIdPath; @@ -909,4 +910,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue index a91044925..53731d513 100644 --- a/src/views/modules/census/census-nineList.vue +++ b/src/views/modules/census/census-nineList.vue @@ -26,8 +26,8 @@
九小场所分析
- - +
+
- - +
+
@@ -50,8 +50,8 @@
- - +
+
@@ -244,7 +244,6 @@ export default { async getTableData() { this.tableLoading = true; const url = '/gov/org/enterprise/list'; - const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { @@ -669,4 +668,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue index 2d5e37e62..02bb76907 100644 --- a/src/views/modules/census/census-orgStatusList.vue +++ b/src/views/modules/census/census-orgStatusList.vue @@ -570,4 +570,13 @@ export default { .cur { cursor: pointer; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue index 296019fcb..2e334d7f4 100644 --- a/src/views/modules/census/census-residentList.vue +++ b/src/views/modules/census/census-residentList.vue @@ -26,18 +26,18 @@
居民年龄统计
- - -
+
+
+ -
- - + +
+
@@ -50,23 +50,23 @@
- - +
+
居民学历统计
- - -
+
+
+ -
- - + +
+
@@ -79,8 +79,8 @@
- - +
+
@@ -268,7 +268,7 @@ export default { }, async getTableData() { this.tableLoading = true; - + const url = '/epmetuser/icresiuser/portrayal-list'; const { pageSize, pageNo, formData } = this; @@ -872,10 +872,19 @@ export default { .diy-button--output { width: 100px; height: 38px; -z-index: 99; + z-index: 99; background: #feb349; box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31); border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue index 022a6b75d..7b42fb08f 100644 --- a/src/views/modules/communityParty/dyhx/party.vue +++ b/src/views/modules/communityParty/dyhx/party.vue @@ -24,8 +24,8 @@
党员年龄统计
- - +
+
- - +
+
@@ -48,60 +48,51 @@
- - -
-
- 导出 -
-
- - - +
+ > +
+
+
+ 导出 +
+ + + - - + + - + - - - - + + + + - -
-
+
党员学历统计
- - +
+
- - +
+
@@ -124,55 +115,45 @@
- - -
-
- 导出 -
-
- - - +
+
+
+
+ 导出 +
+ + + - - + + - + - - - - + + + + - -
-
+
@@ -1039,4 +1020,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +}