diff --git a/src/api/screen/screen.ts b/src/api/screen/screen.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/views/datav/CaseVerif.vue b/src/views/datav/CaseVerif.vue index 9f0af20..8cd8006 100644 --- a/src/views/datav/CaseVerif.vue +++ b/src/views/datav/CaseVerif.vue @@ -84,7 +84,7 @@ style="width: 16.66%" /> { diff --git a/src/views/datav/RightsComfort.vue b/src/views/datav/RightsComfort.vue index 97fa001..347b24d 100644 --- a/src/views/datav/RightsComfort.vue +++ b/src/views/datav/RightsComfort.vue @@ -213,7 +213,7 @@ import vCharts from "vue-echarts"; import changshaMap from "@/assets/data/changsha.json"; import * as echarts from "echarts/core"; -import {getRightsComfortData} from "@/api/datav"; + import moment from "moment"; import { getALlComfortCount, @@ -539,12 +539,12 @@ const getComfortSituationList = async (timeValue) => { // 民辅警受伤情况-受伤人数 const getPoliceHurtSituationList = async (timeValue) => { - const res = getPoliceHurtSituationAndHurtType(timeValue); + const res = await getPoliceHurtSituationAndHurtType(timeValue); hurtNumOption.value.series[0].data = res.policeHurtSituationList } const getCaseAriseSituationRateList = async (timeValue) => { - const res = getCaseAriseSituationRate(timeValue); + const res = await getCaseAriseSituationRate(timeValue); ariseCaseLinkOption.value.series[0].data = res.incidentLinkList ariseCasePoliceOption.value.series[0].data = res.incidentPoliceTypeList ariseCaseORgOption.value.series[0].data = res.incidentOrgList diff --git a/src/views/datav/VideoInsp.vue b/src/views/datav/VideoInsp.vue index 7021467..682a180 100644 --- a/src/views/datav/VideoInsp.vue +++ b/src/views/datav/VideoInsp.vue @@ -220,7 +220,7 @@ const mapIconList = ref([{ relativePer: 152, changedRate: 100 }]) -const ProblemTypeRate = ref([]) + const currentYear = new Date().getFullYear(); const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表 const selectedYear = ref('2024'); // 当前选中的年份 @@ -284,7 +284,7 @@ const getMap = async (timeValue) => { const getProblemTypeRate = async (timeValue) => { const res = await getVideoSuperviseProblemTypeRate(timeValue); - ProblemTypeRate.value = res.videoSuperviseProblemTypeRate + ProblemTypeRateChart.value.series[0].data = res.videoSuperviseProblemTypeRate } @@ -303,10 +303,10 @@ const getTrend = async(year)=> { } const getData = async () => { getOverview(time.value); - getProblemTypeRate(time.value); getRankList(time.value) getMap(time.value) getTrend(selectedYear.value) + getProblemTypeRate(time.value); } // endregion @@ -478,7 +478,7 @@ const ProblemTypeRateChart = ref({ label: { color: "#fff", }, - data: ProblemTypeRate.value, + data: [], }, ], tooltip: {