-
+
@@ -107,25 +106,34 @@
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+ background: #feb349;
+ box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
+ border-radius: 6px;
+ color: #fff;
+}
+
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 3d54778be..047b591ae 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -4,7 +4,7 @@
-
+
-
-
- 至
-
-
+
查询
-
-
+
@@ -54,7 +31,7 @@
-
+
@@ -64,7 +41,7 @@
-
+
@@ -74,7 +51,7 @@
-
+
@@ -97,7 +74,38 @@
-
下级社区数量统计
+
+ 下级社区数量统计
+
+
+
+
+ 至
+
+
+
+
+
import screenEchartsFrame from './chart';
-import { pieOption } from './Option.js';
+
import { requestPost, requestGet } from '@/js/dai/request';
import nextTick from 'dai-js/tools/nextTick';
import { mapGetters } from 'vuex';
@@ -148,8 +156,8 @@ export default {
let endDisabledDate = time => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now();
- if (this.formData.startDate) {
- let startDate = new Date(this.formData.startDate);
+ if (this.formData2.startDate) {
+ let startDate = new Date(this.formData2.startDate);
return time.getTime() > nowData || time.getTime() < startDate || time.getTime() === startDate;
} else {
return time.getTime() > nowData;
@@ -177,17 +185,20 @@ export default {
orgOptions: [],
orgOptionProps: {
multiple: false,
- value: 'agencyId',
- label: 'agencyName',
+ checkStrictly: true,
+ emitPath: false,
children: 'subAgencyList',
- checkStrictly: true
+ label: 'agencyName',
+ value: 'agencyId'
},
tableData: [],
tableDataView: [],
censusData: { district: '', street: '', community: '', grid: '', staff: '' },
formData: {
orgId: '',
- level: '',
+ level: ''
+ },
+ formData2: {
startDate: '',
endDate: ''
},
@@ -211,7 +222,8 @@ export default {
multipleSelection: [],
TableHeight: '',
- pieData: {}
+ pieData: {},
+ agencyId: ''
};
},
components: {
@@ -219,7 +231,7 @@ export default {
},
computed: {
maxTableHeight() {
- this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeigh : this.clientHeight - 420;
+ this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
console.log('this.TableHeight', this.TableHeight);
return this.TableHeight;
},
@@ -227,10 +239,10 @@ export default {
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
- 'formData.endDate': function(val) {
+ 'formData2.endDate': function(val) {
if (val && val != '') {
let arrayTemp = val.split(' ');
- this.formData.endDate = arrayTemp[0] + ' 23:59:59';
+ this.formData2.endDate = arrayTemp[0] + ' 23:59:59';
}
}
},
@@ -238,7 +250,7 @@ export default {
console.log(this.$store.state);
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
- console.log(this.user)
+ console.log(this.user);
this.getOrgTreeList();
this.getTableData();
@@ -271,8 +283,8 @@ export default {
url = '/gov/org/customeragency/getCommunityList';
param = {
agencyId: this.orgId,
- timeStart: this.formData.startDate,
- timeEnd: this.formData.endDate,
+ timeStart: this.formData2.startDate,
+ timeEnd: this.formData2.endDate,
pageNum: this.pageNo,
pageSize: this.pageSize
};
@@ -340,13 +352,15 @@ export default {
console.log('this.formData.orgId', this.formData.orgId);
let agencyId = '';
- if (this.formData.orgId == '') {
- agencyId = this.agencyId;
- this.level=this.user.level
- } else {
+ let tmp = this.formData.orgId;
+ if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
agencyId = this.formData.orgId;
- this.level=this.formData.level
+ this.level = this.formData.level;
+ } else {
+ agencyId = this.agencyId;
+ this.level = this.user.level;
}
+
const url = '/gov/org/customeragency/getAgencyCountList';
let params = { agencyId: agencyId };
const { data, code, msg } = await requestGet(url, params);
@@ -360,41 +374,18 @@ export default {
this.$message.error(msg);
}
},
- async getTableData() {
- // this.tableLoading = true;
- // const url = '/gov/org/customeragency/getCommunityCountList';
- // let agencyId = '';
- // if (this.formData.orgId == '') {
- // agencyId = this.agencyId;
- // } else {
- // agencyId = this.formData.orgId;
- // }
- // const { data, code, msg } = await requestPost(url, {
- // {agencyId:agencyId}
- // });
- // this.tableLoading = false;
- // if (code === 0) {
- // this.total = data.total || 0;
- // this.tableData = data.list
- // ? data.list.map(item => {
- // return item;
- // })
- // : [];
- // // console.log('this.tableData ', this.tableData);
- // } else {
- // this.$message.error(msg);
- // }
- },
+ async getTableData() {},
async getsubData() {
this.$refs.pieChart.showLoading();
let url = '/gov/org/customeragency/getCommunityCountList';
let agencyId = '';
- if (this.formData.orgId == '') {
- agencyId = this.agencyId;
- } else {
+ let tmp = this.formData.orgId;
+ if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
agencyId = this.formData.orgId;
+ } else {
+ agencyId = this.agencyId;
}
- const { data, code, msg } = await requestPost(url, { agencyId: agencyId });
+ const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData2.startDate, timeEnd: this.formData2.endDate });
this.$refs.pieChart.hideLoading();
@@ -458,7 +449,18 @@ export default {
},
xAxis: {
type: 'category',
- data: chartData.name
+ data: chartData.name,
+ axisLabel: {
+ interval: 0,
+ interval: 0, //设置横坐标为斜
+ rotate: 30, //文字倾斜角度
+ formatter: function(value) {
+ if (value.length > 10) {
+ value = value.substring(0, 9) + '..';
+ }
+ return value;
+ }
+ }
},
yAxis: {
type: 'value',
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 3763ac739..144f1ffc2 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -1,12 +1,874 @@
-
+
+
+
+
+
+
+ 居民年龄统计
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
+
{{ item.value }}
+
{{ item.value / 100 }}%
+
+
+
+
居民学历统计
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
+
{{ item.value }}
+
{{ item.value / 100 }}%
+
+
+
+
+
+
+
+
+
巡查记录
+
+
+ 新增
+
+
+
+
+
+
+
+ {{ scope.row.patrolTime }}
+
+
+
+
+
+
+
+
+ {{ scope.row.staffName }}
+
+
+
+
+
+
+ {{ scope.row.mobile }}
+
+
+
+
+
+
+
+
+ {{ scope.row.result == 1 ? '正常' : '异常' }}
+
+
+
+
+
+
+
+
+
+
+ 最多三张图片
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.reviewTime }}
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
-
-
-
-
-
党员年龄统计
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
{{item.value}}
-
{{ item.radio }}
-
-
-
-
-
-
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
党员学历统计
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 
+