elink-star
/
epmet-oper-gov
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

登录联调

dev
tianq 3 years ago
parent
cbdc6f0e73
commit
0091231899
2 changed files with 138 additions and 197 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 128
      src/views/modules/census/census-accountList.vue
  2. 207
      src/views/modules/census/census-houseList.vue

128
src/views/modules/census/census-accountList.vue
View File

@ -39,7 +39,7 @@
placeholder="结束时间" placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-button class="btnSearch" size="small" @click="getTableData">查询</el-button> <el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
</div> </div>
</el-form> </el-form>
<div class="flex"> <div class="flex">
@ -238,7 +238,8 @@ export default {
selVoiceUrl: '', selVoiceUrl: '',
multipleSelection: [], multipleSelection: [],
TableHeight: '' TableHeight: '',
pieData: {}
}; };
}, },
components: { components: {
@ -265,16 +266,22 @@ export default {
this.user = this.$store.state.user; this.user = this.$store.state.user;
this.agencyId = this.user.agencyId; this.agencyId = this.user.agencyId;
this.getOrgTreeList(); this.getOrgTreeList();
this.getTableData();
this.getCountLevel(); this.getCountLevel();
this.getPie(); this.getTableData();
this.getsubData();
// this.getPie();
}, },
methods: { methods: {
handleSearch(val) {
this.getCountLevel();
this.getTableData();
this.getsubData();
},
show(type) { show(type) {
switch (type) { switch (type) {
case 1: case 1:
this.orgType = 'district'; this.orgType = 'district';
break; break;
case 2: case 2:
this.orgType = 'street'; this.orgType = 'street';
@ -286,7 +293,7 @@ export default {
this.orgType = 'sub'; this.orgType = 'sub';
break; break;
} }
this.orgId = this.formData.orgId;
this.pageNo = 1; this.pageNo = 1;
this.showNext(); this.showNext();
this.dialogVisible = true; this.dialogVisible = true;
@ -297,67 +304,34 @@ export default {
async showNext() { async showNext() {
let url = ''; let url = '';
let param = {}; let param = {};
console.log('this.orgType', this.orgType);
// district street community // district street community
// 1 是区县 2是镇街 3是社区 4是下级 // 1 是区县 2是镇街 3是社区 4是下级
switch (this.orgType) { switch (this.orgType) {
case 'district': case 'district':
this.title = '区县级账号登录情况'; this.title = '区县级账号登录情况';
url = '/gov/org/staffLoginLog/district-count'; url = '/gov/org/staffLoginLog/district-count';
param = {
orgId: this.formData.orgId,
level: this.orgType,
startDate: this.formData.startDate,
endDate: this.formData.endDate,
isPage: true,
pageNo: this.pageNo,
pageSize: this.pageSize
};
break; break;
case 'street': case 'street':
this.title = '镇街级账号登录情况'; this.title = '镇街级账号登录情况';
url = '/gov/org/staffLoginLog/street-count'; url = '/gov/org/staffLoginLog/street-count';
param = {
orgId: this.formData.orgId,
level: this.orgType,
startDate: this.formData.startDate,
endDate: this.formData.endDate,
isPage: true,
pageNo: this.pageNo,
pageSize: this.pageSize
};
break; break;
case 'community': case 'community':
this.title = '社区级账号登录情况'; this.title = '社区级账号登录情况';
url = '/gov/org/staffLoginLog/community-count'; url = '/gov/org/staffLoginLog/community-count';
param = {
orgId: this.formData.orgId,
level: this.orgType,
startDate: this.formData.startDate,
endDate: this.formData.endDate,
isPage: true,
pageNo: this.pageNo,
pageSize: this.pageSize
};
break;
case 'sub':
this.title = this.orgName + '账号登录情况';
url = '/gov/org/staffLoginLog/sub-count';
param = {
orgId: this.orgId,
level: this.level,
startDate: this.formData.startDate,
endDate: this.formData.endDate
// isPage: true,
// pageNo: this.pageNo,
// pageSize: this.pageSize
};
break; break;
} }
param = {
orgId: this.orgId,
level: this.orgType,
startDate: this.formData.startDate,
endDate: this.formData.endDate,
isPage: true,
pageNo: this.pageNo,
pageSize: this.pageSize
};
this.tableLoading2 = true; this.tableLoading2 = true;
const { data, code, msg } = await requestPost(url, param); const { data, code, msg } = await requestPost(url, param);
this.tableLoading2 = false; this.tableLoading2 = false;
if (code === 0) { if (code === 0) {
this.total = data.total || 0; this.total = data.total || 0;
@ -376,9 +350,7 @@ export default {
console.log(obj); console.log(obj);
this.formData.orgId = obj.agencyId; this.formData.orgId = obj.agencyId;
this.formData.level = obj.level; this.formData.level = obj.level;
this.getTableData();
}, },
getOrgTreeList() { getOrgTreeList() {
const { user } = this.$store.state; const { user } = this.$store.state;
this.$http this.$http
@ -429,7 +401,7 @@ export default {
}, },
async getTableData() { async getTableData() {
this.tableLoading = true; this.tableLoading = true;
this.$refs.pieChart.showLoading();
const url = '/gov/org/staffLoginLog/community-count'; const url = '/gov/org/staffLoginLog/community-count';
// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count'; // const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
@ -440,7 +412,7 @@ export default {
isPage: true, isPage: true,
...formData ...formData
}); });
this.$refs.pieChart.hideLoading();
this.tableLoading = false; this.tableLoading = false;
if (code === 0) { if (code === 0) {
this.total = data.total || 0; this.total = data.total || 0;
@ -451,12 +423,30 @@ export default {
}) })
: []; : [];
console.log('this.tableData ', this.tableData); console.log('this.tableData ', this.tableData);
this.getPie();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
async getsubData() {
this.$refs.pieChart.showLoading();
let url = '/gov/org/staffLoginLog/sub-count';
let param = {
orgId: this.formData.orgId,
level: this.formData.level,
startDate: this.formData.startDate,
endDate: this.formData.endDate
};
const { data, code, msg } = await requestPost(url, param);
this.$refs.pieChart.hideLoading();
if (code === 0) {
this.pieData = data.list;
console.log('this.pieData ', this.pieData);
this.getPie();
} else {
this.$message.error(msg);
}
},
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem('pageSize', val); window.localStorage.setItem('pageSize', val);
@ -490,30 +480,31 @@ export default {
} }
}, },
setPieData() { setPieData() {
let data = [...this.tableData]; let data = [...this.pieData];
let PieData = {}; console.log('data', data);
PieData.name = data.map(item => item.agencyName); let chartData = {};
PieData.data = data.map(item => { chartData.name = data.map(item => item.agencyName);
chartData.data = data.map(item => {
return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName }; return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
}); });
console.log(PieData); console.log('chartData', chartData);
this.iniPieChart(PieData); this.iniPieChart(chartData);
}, },
// 获取饼状图 // 获取饼状图
async iniPieChart(PieData) { async iniPieChart(chartData) {
this.$refs.pieChart.clear(); this.$refs.pieChart.clear();
// 获取pieChart配置 // 获取pieChart配置
this.pieOption = { this.pieOption = {
xAxis: { xAxis: {
type: 'category', type: 'category',
data: PieData.name data: chartData.name
}, },
yAxis: { yAxis: {
type: 'value' type: 'value'
}, },
series: [ series: [
{ {
data: PieData.data, data: chartData.data,
type: 'bar', type: 'bar',
itemStyle: { itemStyle: {
color: 'rgb(33, 149, 254)' color: 'rgb(33, 149, 254)'
@ -524,10 +515,13 @@ export default {
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
}, },
handelClickMyPei(param) { handelClickMyPei(param) {
this.show(4); console.log(param);
this.level = param.level; this.orgType = param.data.level;
this.orgId = param.id; this.orgId = param.data.id;
this.orgName = param.name; this.orgName = param.data.name;
this.pageNo = 1;
this.showNext();
this.dialogVisible = true;
} }
} }
}; };

207
src/views/modules/census/census-houseList.vue
View File

@ -75,7 +75,7 @@
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
class="table" class="table"
style="width: 100%" style="width: 100%"
:height="maxTableHeight" :height="TableHeight"
> >
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
@ -92,7 +92,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[10, 20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total"
@ -115,7 +115,6 @@ import axios from 'axios';
export default { export default {
components: { screenEchartsFrame, screenEchartsFrame2 }, components: { screenEchartsFrame, screenEchartsFrame2 },
data() { data() {
let endDisabledDate = time => { let endDisabledDate = time => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@ -132,64 +131,42 @@ export default {
let nowData = Date.now(); let nowData = Date.now();
return time.getTime() > nowData; return time.getTime() > nowData;
}; };
return { return {
tableLoading: false, tableLoading: false,
pageType: 'list', // 列表list 新增add 处理dispose 详情info
user: {}, user: {},
agencyId: '',
gridList: [], //所属网格list--场所区域 gridList: [], //所属网格list--场所区域
agencyIdArray: [],
orgOptions: [],
orgOptionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
tableData: [], tableData: [],
formData: {},
formData: {
gridId: '',
agencyId: '',
sourceType: '',
eventContent: '',
name: '',
mobile: '',
startTime: '',
endTime: '',
status: '',
firstIdList: [],
secondIdList: []
},
cateOptions: [],
eventTypeCheck: [],
pageNo: 1, pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20, pageSize: window.localStorage.getItem('pageSize') || 20,
total: 1, total: 1,
endPickerOptions: { endPickerOptions: {
//时间
disabledDate: endDisabledDate disabledDate: endDisabledDate
}, },
startPickerOptions: { startPickerOptions: {
//时间
disabledDate: startDisabledDate disabledDate: startDisabledDate
}, },
eventId: '', agencyId: '', //组织
agencyIdArray: [], //组织
eventDetailData: {}, orgOptions: [], //组织
orgOptionProps: {
showVoice: false, //组织
selVoiceUrl: '', multiple: false,
value: 'agencyId',
multipleSelection: [], label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
TableHeight: '' TableHeight: ''
}; };
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe ? this.clientHeight - 440 + this.iframeHeigh : this.clientHeight - 440; this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 460 + this.iframeHeigh : this.clientHeight - 460;
return this.TableHeight;
}, },
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
}, },
watch: { watch: {
@ -203,52 +180,49 @@ export default {
mounted() { mounted() {
console.log(this.$store.state); console.log(this.$store.state);
this.user = this.$store.state.user; this.user = this.$store.state.user;
this.agencyId = this.user.agencyId; this.agencyId = this.user.agencyId;
this.getOrgTreeList(); this.getOrgTreeList();
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
handleChangeAgency(val) {
let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
if (obj) {
if (obj.level === 'grid') {
this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.agencyId = '';
} else {
this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.gridId = '';
}
} else {
this.formData.agencyId = '';
this.formData.gridId = '';
}
},
handleSearch(val) { handleSearch(val) {
console.log(this.formData); console.log(this.formData);
this.pageNo = 1; this.pageNo = 1;
this.getTableData(); this.getTableData();
}, },
async getTableData() {
this.tableLoading = true;
// const url = '/gov/org/staffLoginLog/community-count';
const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
getOrgTreeList() { const { pageSize, pageNo, formData } = this;
const { user } = this.$store.state; const { data, code, msg } = await requestPost(url, {
this.$http pageSize,
.post('/gov/org/customeragency/agencygridtree', {}) pageNo,
.then(({ data: res }) => { ...formData
if (res.code !== 0) { });
return this.$message.error(res.msg);
} else {
console.log('获取组织树成功', res.data);
this.orgOptions = [];
this.orgOptions.push(res.data);
}
})
.catch(() => {
return this.$message.error('网络错误');
});
},
this.tableLoading = false;
if (code === 0) {
this.total = data.total || 0;
this.tableData = data.list
? data.list.map(item => {
return item;
})
: [];
} else {
this.$message.error(msg);
}
},
handleSizeChange(val) {
this.pageSize = val;
window.localStorage.setItem('pageSize', val);
this.getTableData();
},
handleCurrentChange(val) {
this.pageNo = val;
this.getTableData();
},
async handleExport() { async handleExport() {
const url = '/gov/project/icEvent/export'; const url = '/gov/project/icEvent/export';
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
@ -281,65 +255,38 @@ export default {
return this.$message.error('网络错误'); return this.$message.error('网络错误');
}); });
}, },
getOrgTreeList() {
//加载组织数据 const { user } = this.$store.state;
async handleDispose(row) { this.$http
this.eventId = row.icEventId; .post('/gov/org/customeragency/agencygridtree', {})
const url = '/gov/project/icEvent/detail'; .then(({ data: res }) => {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; if (res.code !== 0) {
return this.$message.error(res.msg);
const { data, code, msg } = await requestPost(url, { } else {
icEventId: this.eventId console.log('获取组织树成功', res.data);
}); this.orgOptions = [];
this.orgOptions.push(res.data);
if (code === 0) { }
this.eventDetailData = { ...data }; })
this.pageType = 'dispose'; .catch(() => {
} else { return this.$message.error('网络错误');
this.$message.error(msg); });
}
},
async getCountLevel() {
// const url = '/gov/org/staffLoginLog/count-level';
const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level';
let param = {};
}, },
async getTableData() { handleChangeAgency(val) {
this.tableLoading = true; let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
// const url = '/gov/org/staffLoginLog/community-count'; if (obj) {
const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count'; if (obj.level === 'grid') {
this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
const { pageSize, pageNo, formData } = this; this.formData.agencyId = '';
const { data, code, msg } = await requestPost(url, { } else {
pageSize, this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
pageNo, this.formData.gridId = '';
...formData }
});
this.tableLoading = false;
if (code === 0) {
this.total = data.total || 0;
this.tableData = data.list
? data.list.map(item => {
return item;
})
: [];
} else { } else {
this.$message.error(msg); this.formData.agencyId = '';
this.formData.gridId = '';
} }
}, },
handleSizeChange(val) {
this.pageSize = val;
window.localStorage.setItem('pageSize', val);
this.getTableData();
},
handleCurrentChange(val) {
this.pageNo = val;
this.getTableData();
},
deepTree(arr, child) { deepTree(arr, child) {
if (Array.isArray(arr) && arr.length > 0) { if (Array.isArray(arr) && arr.length > 0) {
return arr.map(item => { return arr.map(item => {

Write Preview
Loading…
Cancel
Save