Browse Source

fix:民意感知修复

main
pengwei 8 months ago
parent
commit
9e7d654848
  1. 27
      src/views/datav/Jwpy.vue

27
src/views/datav/Jwpy.vue

@ -368,14 +368,14 @@ const toggleSelect=()=> {
const handleYearChange = (checkedYear) => { const handleYearChange = (checkedYear) => {
toggleSelect() toggleSelect()
console.log(checkedYear) console.log(checkedYear)
yearValue.value= years.value.find(s=>s.ID === checkedYear).PeriodName; // yearValue.value= years.value.find(s=>s.ID === checkedYear).PeriodName;
console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value) console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
getData(); getData();
} }
const handleMonthChange = (checkedMonth) => { const handleMonthChange = (checkedMonth) => {
toggleSelect() toggleSelect()
monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName; // monthValue.value= months.value.find(s=>s.ID === checkedMonth).SonPeriodName;
console.log(monthValue.value) console.log(monthValue.value)
console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value) console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
getData(); getData();
@ -387,7 +387,7 @@ const handleOrgChange = async (checkedOrg) => {
// 使 await task // 使 await task
content.value = await GetOffLineStatisticsSetList(selectOrg.value); content.value = await GetOffLineStatisticsSetList(selectOrg.value);
task.value = content.value[0].ID; task.value = content.value[0].ID;
taskValue.value= content.value[0].text; // taskValue.value= content.value[0].text;
// //
const targetName = mapDataList.value.find(item => item.value === checkedOrg).name; const targetName = mapDataList.value.find(item => item.value === checkedOrg).name;
const chart = echarts.getInstanceByDom(document.querySelector('.map-option')); const chart = echarts.getInstanceByDom(document.querySelector('.map-option'));
@ -405,7 +405,7 @@ const handleOrgChange = async (checkedOrg) => {
// //
const handleTaskChange = (checkedTask) => { const handleTaskChange = (checkedTask) => {
toggleSelect() toggleSelect()
taskValue.value= task.value.find(s=>s.ID === checkedTask).SetName; // taskValue.value= task.value.find(s=>s.ID === checkedTask).SetName;
console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value) console.log("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value)
getData(); getData();
} }
@ -768,7 +768,8 @@ onMounted(async () => {
if (years.value.length > 0) { if (years.value.length > 0) {
selectYear.value = years.value[0].ID; // selectYear.value = years.value[0].ID; //
console.log("第一个年份" + selectYear.value) console.log("第一个年份" + selectYear.value)
yearValue.value = years.value[0].PeriodName; // yearValue.value = years.value[0].PeriodName;
console.log('yearValue',years.value)
} }
// //
@ -789,7 +790,8 @@ onMounted(async () => {
months.value.unshift({SonPeriodName: '全年', ID: '-1'}); months.value.unshift({SonPeriodName: '全年', ID: '-1'});
} }
selectMonth.value = months.value[0].ID; selectMonth.value = months.value[0].ID;
monthValue.value = months.value[0].SonPeriodName; // monthValue.value = months.value[0].SonPeriodName;
console.log('monthValue.value',months.value)
} }
// //
@ -797,16 +799,16 @@ onMounted(async () => {
org.value = resOrgs; org.value = resOrgs;
if (org.value.length > 0) { if (org.value.length > 0) {
selectOrg.value = org.value[0].id; selectOrg.value = org.value[0].id;
console.log(selectOrg.value); console.log('selectOrg.value',org.value);
orgValue.value = org.value[0].text; // orgValue.value = org.value[0].text;
} }
const resTasks = await GetOffLineStatisticsSetList(selectOrg.value); const resTasks = await GetOffLineStatisticsSetList(selectOrg.value);
content.value = resTasks; content.value = resTasks;
if (content.value.length > 0) { if (content.value.length > 0) {
console.log(content.value[0]);
task.value = content.value[0].ID; task.value = content.value[0].ID;
taskValue.value = content.value[0].SetName; console.log('task.value', content.value)
// taskValue.value = content.value[0].SetName;
} }
// //
await getData(); await getData();
@ -814,18 +816,19 @@ onMounted(async () => {
async function getData() { async function getData() {
// //
GetDCQK(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => { GetDCQK(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => {
reviewOk.value = res reviewOk.value = res
}); });
console.log('-----调查情况----')
// //
GetGLFW(selectYear.value, selectOrg.value, task.value).then((res) => { GetGLFW(selectYear.value, selectOrg.value, task.value).then((res) => {
dcmyd.value = res dcmyd.value = res
option1.value.xAxis.data = dcmyd.value[0].lstson.slice(-6).map(item => item.SonPeriodName); option1.value.xAxis.data = dcmyd.value[0].lstson.slice(-6).map(item => item.SonPeriodName);
option1.value.series[0].data = dcmyd.value[0].lstson.slice(-6).map(item => item.FinalRP); option1.value.series[0].data = dcmyd.value[0].lstson.slice(-6).map(item => item.FinalRP);
}); });
console.log('-----调查满意度----')
// //
GetZRSJXF(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => { GetZRSJXF(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => {
let temp = res.lstShen let temp = res.lstShen

Loading…
Cancel
Save