diff --git a/src/views/datav/Jwpy.vue b/src/views/datav/Jwpy.vue index 8653f85..ee56d7d 100644 --- a/src/views/datav/Jwpy.vue +++ b/src/views/datav/Jwpy.vue @@ -368,14 +368,14 @@ const toggleSelect=()=> { const handleYearChange = (checkedYear) => { toggleSelect() 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) getData(); } const handleMonthChange = (checkedMonth) => { 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("年份" + selectYear.value + " 月份" + selectMonth.value + " 单位" + selectOrg.value + " task" + task.value) getData(); @@ -387,7 +387,7 @@ const handleOrgChange = async (checkedOrg) => { // 使用 await 等待异步操作完成 因为要等返回选中第一个 task 之后才能发送正确的请求 content.value = await GetOffLineStatisticsSetList(selectOrg.value); 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 chart = echarts.getInstanceByDom(document.querySelector('.map-option')); @@ -405,7 +405,7 @@ const handleOrgChange = async (checkedOrg) => { // 任务选项改变时 const handleTaskChange = (checkedTask) => { 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) getData(); } @@ -768,7 +768,8 @@ onMounted(async () => { if (years.value.length > 0) { selectYear.value = years.value[0].ID; // 选择第一个年份 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'}); } 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; if (org.value.length > 0) { selectOrg.value = org.value[0].id; - console.log(selectOrg.value); - orgValue.value = org.value[0].text; + console.log('selectOrg.value',org.value); + // orgValue.value = org.value[0].text; } const resTasks = await GetOffLineStatisticsSetList(selectOrg.value); content.value = resTasks; if (content.value.length > 0) { - console.log(content.value[0]); 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(); @@ -814,18 +816,19 @@ onMounted(async () => { async function getData() { + // 调查情况 GetDCQK(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => { reviewOk.value = res }); - + console.log('-----调查情况----') // 调查满意度 GetGLFW(selectYear.value, selectOrg.value, task.value).then((res) => { dcmyd.value = res 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); }); - + console.log('-----调查满意度----') // 业务满意率 GetZRSJXF(selectYear.value, selectMonth.value, selectOrg.value, task.value).then((res) => { let temp = res.lstShen