diff --git a/src/api/data/aduit.ts b/src/api/data/aduit.ts index 4289c3a..e772c91 100644 --- a/src/api/data/aduit.ts +++ b/src/api/data/aduit.ts @@ -7,9 +7,10 @@ export function getWorkDynamics(times) { }); } -export function getAuditNegativeVo(times){ - return request.get({ - url: `/datav/audit/getAuditNegativeVo?beginTime=${times[0]}&endTime=${times[1]}` +export function getAuditNegativeVo(body){ + return request.post({ + url: `/datav/audit/getAuditNegativeVo`, + body }) } diff --git a/src/views/datav/AuditSuper.vue b/src/views/datav/AuditSuper.vue index 2de663e..ea40f3a 100644 --- a/src/views/datav/AuditSuper.vue +++ b/src/views/datav/AuditSuper.vue @@ -7,41 +7,207 @@ - + - - - - - - - - - - + + + + + +
+
+ {{ leftOverview.projectNumber }} +
+
+ 审计单位/项目 +
+
+ + + +
+
+ {{ leftOverview.auditAmount }} +
+
+ 审计总金额（万元） +
+
+ + + +
+
+ {{ leftOverview.auditSjAmount }} +
+
+ 审减/问题金额（万元） +
+
+ + + +
+
+ {{ leftOverview.negativeNumber }} +
+
+ 查处问题数 +
+
+ + + +
+
+ {{ leftOverview.accountableNumber }} +
+
+ 追责问责数 +
+
+ + + + + + + + + +
+
+ {{ leftOverview.projectNumber }} +
+
+ 审计单位/项目 +
+
+ + + +
+
+ {{ leftOverview.auditAmount }} +
+
+ 审计总金额（万元） +
+
+ + + +
+
+ {{ leftOverview.auditSjAmount }} +
+
+ 审减/问题金额（万元） +
+
+ + + +
+
+ {{ leftOverview.negativeNumber }} +
+
+ 查处问题数 +
+
+ + + +
+
+ {{ leftOverview.accountableNumber }} +
+
+ 追责问责数 +
+
+ + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { getData(); }); + +const activeAuditType = ref(""); +const fxsjList = ref([]); // 问题排行分县市局 +const jsdwList = ref([]); // 问题排行局属单位 +const leftOverview = ref({}); + +const catchStore = useCatchStore(); +const dictData = computed(() => { + return (catchStore.getDictProblemSources() + .find(item => item.id === "26")?.children || []) + .map(item => ({ + dictLabel: item.label?.trim(), + dictValue: item.id + })); +}); + const overview = ref({ negativeNumber: 0, accountableNumber: 0, @@ -204,9 +387,22 @@ const problemOptions = ref({ }); onMounted(() => { + console.log("******") + console.log(dictData) getData() }) + +watch( + dictData, + (val) => { + if (val.length > 0 && !activeAuditType.value) { + activeAuditType.value = val[0].dictValue; + getData(); + } + }, + { immediate: true } +); function getData() { getOverviewFun(); getAuditProblems(time.value).then(data => { @@ -224,11 +420,24 @@ function getData() { const fxData =ref([]) const jsData =ref([]) + +watch(activeAuditType, () => { + getAuditNegativeVoFun() +},{deep:true}) const getAuditNegativeVoFun =async ()=>{ - const res = await getAuditNegativeVo(time.value); - if(res){ - fxData.value=res.fxData; - jsData.value=res.jsData; + + if (!activeAuditType.value) return; + + const body = { + beginTime: time.value[0], + endTime: time.value[1], + auditType: activeAuditType.value, + }; + const res = await getAuditNegativeVo(body); + if (res) { + fxsjList.value = res.fxData || []; + jsdwList.value = res.jsData || []; + leftOverview.value = res.leftOverview || {}; } } @@ -290,7 +499,6 @@ const getAuditTrendFun = async (year = selectedYear.value) => { -const auditSuperRankTab = ref('1'); const auditMapData = ref([ { @@ -308,40 +516,46 @@ const option = ref({ geo: { map: "changsha", }, - tooltip: { - trigger: "item", - formatter: function (params) { - const dataItem = auditMapData.value.find((item) => - item.name.includes(params.name.substring(0, 2)) - ); - if (dataItem) { - return ` + tooltip: { + trigger: "item", + formatter: function (params) { + const dataItem = auditMapData.value.find((item) => + item.name.includes(params.name.substring(0, 2)) + ); + + if (dataItem) { + return `
${dataItem.name}
-
    -
  • 审计单位/项目数${dataItem.reportProjectNumber}
    • -
  • 查处问题数 ${dataItem.checkProNumber}
    • -
  • 追责问责数 ${dataItem.rushProNumber}
    • -
  • 整改问题数 ${dataItem.rectifyNumber}
    • +
      +
    • 审计单位/项目数${dataItem.projectNumber ?? "-"}
      • +
    • 审计总金额${dataItem.auditAmount ?? "-"}
      • +
    • 审减金额${dataItem.auditSjAmount ?? "-"}
      • +
    • 问题金额${dataItem.auditWtAmount ?? "-"}
      • +
    • 查出问题数${dataItem.negativeNumber ?? "-"}
      • +
    • 追责问责数${dataItem.accountableNumber ?? "-"}
`; - } else { - return `
+ } else { + return ` +
${params.name}
-
    -
  • 审计单位/项目 -
    • -
  • 查处问题数 -
    • -
  • 追责问责数 -
    • -
  • 整改问题数 -
    • +
      +
    • 审计单位/项目数-
      • +
    • 审计总金额-
      • +
    • 审减金额-
      • +
    • 问题金额-
      • +
    • 查出问题数-
      • +
    • 追责问责数-
`; - } - }, + } }, + }, visualMap: { type: "piecewise", bottom: 10, @@ -453,64 +667,7 @@ const option1 = ref({ }, ], }); -const data1 = [ - { - label: "公交分局", - value: 100, - numerator: 7, - denominator: 8, - }, - { - label: "岳麓分局", - value: 100, - numerator: 2, - denominator: 2, - }, - { - label: "交警支队", - value: 100, - numerator: 2, - denominator: 2, - }, - { - label: "高新分局", - value: 100, - numerator: 1, - denominator: 1, - }, - -]; -const data2 = [ - { - name: "开福分局", - value: 9700, - }, - { - name: "芙蓉分局", - value: 9021, - }, - { - name: "岳麓分局", - value: 8512, - }, - { - name: "雨花分局", - value: 8021, - }, - { - name: "望城分局", - value: 7111, - }, - { - name: "浏阳市局", - value: 6622, - }, - { - name: "长沙县局", - value: 6221, - }, -]; const option2 = ref({ series: [ { @@ -572,7 +729,7 @@ const getAuditMapData = async ()=>{ endTime: time.value[1] } const res = await getAuditMap(body); - const mappedData = mapOrgNameMapping(res.auditSuperviseMapIconVoList,"checkProNumber"); + const mappedData = mapOrgNameMapping(res.auditSuperviseMapIconVoList,"negativeNumber"); // 总数 const maxItem = mappedData.reduce( (max, item) => (Number(item.value) > Number(max.value) ? item : max),