supervision
/
supervision-vue
6
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix--信访投诉核对 step2

master
buaixuexideshitongxue 3 weeks ago
parent
0536aa0a00
commit
3d6a73ef3a
4 changed files with 116 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/api/screen/mail.ts
  2. 62
      src/api/screen/subScreen/subOneMailVisits.ts
  3. 28
      src/views/datav/MailVisits.vue
  4. 77
      src/views/datav/subonedatav/SubOneMailVisits.vue

12
src/api/screen/mail.ts
Unescape View File

@ -10,7 +10,7 @@ export function getFirstAndRepeatMail(body) {
}
//初访重访情况
//总览数据
export function getAllMailCount(body) {
return request.post({
url: `/datav/mailVisits/getAllMailCount`,
@ -18,11 +18,11 @@ export function getAllMailCount(body) {
});
}
export function getMailMapIcon(times) {
return request.get({
url: `/datav/mailVisits/getMailMapIcon?beginTime=${times[0]}&endTime=${times[1]}`
// 地图数据
export function getMailMapIcon(body) {
return request.post({
url: `/datav/mailVisits/getMailMapIcon`,
body
});
}

62
src/api/screen/subScreen/subOneMailVisits.ts
Unescape View File

@ -3,38 +3,72 @@ import {getFirstAndRepeatMail} from "../mail";
export function getSubOneFirstAndRepeatMail(departId, times) {
return request.get({
url: `/datav/sub1/mailVisits/getSubOneFirstAndRepeatMail?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
//初访重访情况
export function getSubOneFirstAndRepeatMail(body) {
return request.post({
url: `/datav/sub1/mailVisits/getSubOneFirstAndRepeatMail`,
body
});
}
export function getSubOneMailMapIcon(departId, times) {
return request.get({
url: `/datav/sub1/mailVisits/getSubOneMailMapIcon?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
export function getSubOneAllMailCount(body) {
return request.post({
url: `/datav/sub1/mailVisits/getSubOneAllMailCount`,
body
});
}
export function getSubOneMailTrend(departId, year) {
return request.get({
url: `/datav/sub1/mailVisits/getSubOneMailTrend?departId=${departId}&year=${year}`
// 地图
export function getSubOneMailMapIcon(body) {
return request.post({
url: `/datav/sub1/mailVisits/getSubOneMailMapIcon`,
body
});
}
export function getSubOneAllMailCount(departId, times) {
return request.get({
url: `/datav/sub1/mailVisits/getSubOneAllMailCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// 群众集访情况
export function getSubOneEntanglementAndMassMail(body) {
return request.post({
url: `/datav/sub1/mailVisits/getSubOneEntanglementAndMassMail`,
body
});
}
export function getSubOneEntanglementAndMassMail(departId, times) {
// export function getSubOneFirstAndRepeatMail(departId, times) {
// return request.get({
// url: `/datav/sub1/mailVisits/getSubOneFirstAndRepeatMail?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
// export function getSubOneMailMapIcon(departId, times) {
// return request.get({
// url: `/datav/sub1/mailVisits/getSubOneMailMapIcon?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getSubOneMailTrend(departId, year) {
return request.get({
url: `/datav/sub1/mailVisits/getSubOneEntanglementAndMassMail?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
url: `/datav/sub1/mailVisits/getSubOneMailTrend?departId=${departId}&year=${year}`
});
}
// export function getSubOneAllMailCount(departId, times) {
// return request.get({
// url: `/datav/sub1/mailVisits/getSubOneAllMailCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
// export function getSubOneEntanglementAndMassMail(departId, times) {
// return request.get({
// url: `/datav/sub1/mailVisits/getSubOneEntanglementAndMassMail?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
//追责问责情况
export function getSubOneResultCountFun(departId,times){
return request.get({

28
src/views/datav/MailVisits.vue
Unescape View File

@ -807,7 +807,7 @@ const option3 =ref( {
//获取追责问责情况
const getResultCountData = async (timeValue = time.value)=>{
const getResultCountDataFun = async (timeValue = time.value)=>{
const res = await getResultCount(timeValue);
let resultCountArray = []
Object.keys(res).forEach(s=>{
@ -818,7 +818,7 @@ const getResultCountData = async (timeValue = time.value)=>{
// region 所有函数
const getAllMailCountData = async () => {
const getAllMailCountDataFun = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
@ -832,9 +832,13 @@ const getAllMailCountData = async () => {
}
const getMailMapIconData = async (timeValue = time.value) => {
const getMailMapIconDataFun = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
}
console.log('-------执行')
const res = await getMailMapIcon(timeValue);
const res = await getMailMapIcon(body);
const mappedData = mapOrgNameMapping(res.mailMapIconList, "total");
mailMapIconList.value = mappedData;
console.log('-------执行2')
@ -849,7 +853,7 @@ const getMailMapIconData = async (timeValue = time.value) => {
{gte: avg + range30Percent, label: "高于平均问题30%", color: "#D34343"},
];
}
const getMailTrendData = async (year = selectedYear.value) => {
const getMailTrendDataFun = async (year = selectedYear.value) => {
const res = await getMailTrend(year);
const policeList = res.policeList;
const commissionerList = res.commissionerList;
@ -877,12 +881,16 @@ const getMailTrendData = async (year = selectedYear.value) => {
const getData = () => {
// 初访重访情况
getFirstAndRepeatMailFun();
getAllMailCountData();
getMailMapIconData()
getMailTrendData();
// 信访投诉占比 && 总览数据
getAllMailCountDataFun();
// 地图数据
getMailMapIconDataFun()
// 趋势
getMailTrendDataFun();
// 群众集访情况
getEntanglementAndMassMailFun();
getResultCountData();
// 追责问责情况
getResultCountDataFun();
}
@ -1006,7 +1014,7 @@ onMounted(() => {
});
const handleCommand = (year) => {
selectedYear.value = year;
getMailTrendData()
getMailTrendDataFun()
};
const handleClick = (params) => {
const departId = params.data.departId;

77
src/views/datav/subonedatav/SubOneMailVisits.vue
Unescape View File

@ -211,7 +211,7 @@
<el-col :span="12">
<div class="descriptions_cell text-center">
<div class="descriptions_content">
{{ currentLeftOverview.leaderMail }}
{{ currentRightOverview.leaderReview }}
</div>
<div class="descriptions_label">
领导接访数
@ -430,21 +430,30 @@ const getMapJSON = async (departId = currentDepartId) => {
subOneMailMap.value.chart.setOption(option.value);
}
const getSubOneFirstAndRepeatMailData = async (depart = currentDepartId, timeValue = time.value) => {
const res = await getSubOneFirstAndRepeatMail(depart, timeValue)
fxjsFirstAndRepeatOverview.value = res.fxjsFirstAndRepeatOverview;
bwzdFirstAndRepeatOverview.value = res.bwzdFirstAndRepeatOverview
fxsjFirstMailList.value = res.fxsjFirstRankList;
fxsjRepeatMailList.value = res.fxsjRepeatRankList;
fxsjLeaderViewMailList.value = res.fxsjLeaderViewRankList;
const getSubOneFirstAndRepeatMailData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneFirstAndRepeatMail(body)
fxjsFirstAndRepeatOverview.value = res.fxsjOverview
bwzdFirstAndRepeatOverview.value = res.bwzdOverview
fxsjFirstMailList.value = res.fxsjFirstRankList
fxsjRepeatMailList.value = res.fxsjRepeatRankList
bwzdFirstMailList.value = res.bwzdFirstRankList;
bwzdRepeatMailList.value = res.bwzdRepeatRankList;
bwzdLeaderViewMailList.value = res.bwzdLeaderViewRankList;
bwzdFirstMailList.value = res.bwzdFirstRankList
bwzdRepeatMailList.value = res.bwzdRepeatRankList
}
const getSubOneAllMailCountData = async (depart = currentDepartId, timeValue = time.value) => {
const res = await getSubOneAllMailCount(depart, timeValue)
const getSubOneAllMailCountData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneAllMailCount(body)
overview.value = res.overview;
option2.value.series[0].data= [{value:overview.value.manageMail,name:"局长信箱"},
{value:overview.value.countryMail,name:"国家信访"},
@ -454,19 +463,17 @@ const getSubOneAllMailCountData = async (depart = currentDepartId, timeValue = t
const getSubOneMailMapIconData = async (departId = currentDepartId, timeValue = time.value) => {
const res = await getSubOneMailMapIcon(departId, timeValue);
const getSubOneMailMapIconData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneMailMapIcon(body);
const mappedData = res.mailMapIconList.map(item => {
return {
...item,
value: item.total,
value: Number(item.total),
};
});
mailMapIconList.value = mappedData;
@ -505,17 +512,21 @@ const getSubOneMailTrendData = async (departId = currentDepartId, year = selecte
countryTrend.value.xAxis.data = countrycategories;
countryTrend.value.series[0].data = countryvalues;
}
const getSubOneEntangleMassRankData = async (depart = currentDepartId, timeValue = time.value) => {
const res = await getSubOneEntanglementAndMassMail(depart, timeValue)
fxsjMailEntanglementMassOverview.value = res.fxsjMailEntanglementMassOverview;
bwzdMailEntanglementMassOverview.value = res.bwzdMailEntanglementMassOverview;
fxsjEntanglementMailList.value = res.fxsjEntanglementList;
fxsjMassMailList.value = res.fxsjMassList;
fxsjLeaderReviewMailList.value = res.fxsjLeaderReviewList;
const getSubOneEntangleMassRankData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneEntanglementAndMassMail(body)
fxsjMailEntanglementMassOverview.value = res.fxsjOverview
bwzdMailEntanglementMassOverview.value = res.bwzdOverview
fxsjMassMailList.value = res.fxsjMassMailList
bwzdMassMailList.value = res.bwzdMassMailList
bwzdLeaderReviewMailList.value = res.bwzdLeaderReviewList;
bwzdEntanglementMailList.value = res.bwzdEntanglementList;
bwzdMassMailList.value = res.bwzdMassList;
fxsjLeaderViewMailList.value = res.fxsjLeaderReviewMailList
bwzdLeaderViewMailList.value = res.bwzdLeaderReviewMailList
}
const getData = () => {
getMapJSON();

Write Preview
Loading…
Cancel
Save