diff --git a/src/api/screen/subScreen/supervisionNotify.ts b/src/api/screen/subScreen/supervisionNotify.ts new file mode 100644 index 0000000..a9b3245 --- /dev/null +++ b/src/api/screen/subScreen/supervisionNotify.ts @@ -0,0 +1,108 @@ +import request from "@/api/request"; + + +export function getSubOneChangedRank(departId, times) { + return request.get({ + url: `/datav/sub1/supervisonNotify/getSubOneChangedRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }); +} + + +export function getSubOneProblemTypeRate(departId, times) { + return request.get({ + url: `/datav/sub1/supervisonNotify/getSubOneProblemTypeRate?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }); +} + +export function getSubOneSupervisionTrend(departId, year) { + return request.get({ + url: `/datav/sub1/supervisonNotify/getSubOneSupervisionTrend?departId=${departId}&year=${year}` + }); +} + +// export function getAllSupervisionNotifyCount(times) { +// return request.get({ +// url: `/datav/supervisonNotify?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// /** +// * 问题类型占比 +// */ +// export function getProblemTypeRate(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getProblemTypeRate?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// +// +// export function getChangedRank(times, groupType) { +// return request.get({ +// url: `/datav/supervisonNotify/rank?beginTime=${times[0]}&endTime=${times[1]}&groupType=${groupType}` +// }); +// } +// /** +// * 获取问题趋势数据 +// */ +// export function getSupervisionTrend(year) { +// return request.get({ +// url: `/datav/supervisonNotify/getSupervisionTrend?year=${year}` +// }); +// } +// +// +// +// /** +// * 获取地图数据 +// */ +// export function getMap(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getMap?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// +// /** +// * 黄赌毒数据 +// */ +// export function getYellowBetDrug(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getYellowBetDrug?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// // 枪支管理数据 +// export function getGunController(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getGunController?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// // 枪支管理数据 +// export function getCompanyProblem(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getCompanyProblem?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// // 执法办案数据 +// export function getHandleCase(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getHandleCase?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } +// +// +// // 枪支管理数据 +// export function getCheckBeer(times) { +// return request.get({ +// url: `/datav/supervisonNotify/getCheckBeer?beginTime=${times[0]}&endTime=${times[1]}` +// }); +// } + diff --git a/src/api/screen/subScreen/videoSupervise.ts b/src/api/screen/subScreen/videoSupervise.ts index 4c90e85..7be3011 100644 --- a/src/api/screen/subScreen/videoSupervise.ts +++ b/src/api/screen/subScreen/videoSupervise.ts @@ -18,4 +18,10 @@ export function getSubOneVideoSuperviseTrend(departId,year) { return request.get({ url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseTrend?departId=${departId}&year=${year}` }); +} + +export function getSubOneVideoSuperviseProblemTypeRate(departId,times) { + return request.get({ + url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemTypeRate?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }); } \ No newline at end of file diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue index d6d959d..fafbed1 100644 --- a/src/views/datav/SceneInsp.vue +++ b/src/views/datav/SceneInsp.vue @@ -172,6 +172,7 @@ style="height: 450px" :option="option" autoresize + @click="handleClick" /> { + const departId = params.data.departId; + const url = router.resolve({ + path: "/datav/subOneSceneInsp", + query: {departId: departId}, + }).href; + window.open(url, "_blank"); +} diff --git a/src/views/datav/subonedatav/SubOneSceneInsp.vue b/src/views/datav/subonedatav/SubOneSceneInsp.vue new file mode 100644 index 0000000..dd1b9c2 --- /dev/null +++ b/src/views/datav/subonedatav/SubOneSceneInsp.vue @@ -0,0 +1,1421 @@ + + + + + \ No newline at end of file diff --git a/src/views/datav/subonedatav/SubOneVideoInsp.vue b/src/views/datav/subonedatav/SubOneVideoInsp.vue index 40d7451..4850de0 100644 --- a/src/views/datav/subonedatav/SubOneVideoInsp.vue +++ b/src/views/datav/subonedatav/SubOneVideoInsp.vue @@ -191,15 +191,13 @@ import changshaMap from "@/assets/data/changsha.json"; import vCharts from "vue-echarts"; import * as echarts from "echarts/core"; import { - getAllVideoSuperviseCount, - getVideoSuperviseProblemTypeRate, - getVideoSuperviseProblemRank, getVideoSuperviseMap, getVideoSuperviseTrend + getVideoSuperviseMap } from "@/api/screen/videoSupervise.ts"; import moment from "moment/moment.js"; import {getSubOneStreetMap} from "@/api/screen/sub1.ts"; import { getSubOneAllVideoSuperviseCount, - getSubOneVideoSuperviseProblemRank, getSubOneVideoSuperviseTrend + getSubOneVideoSuperviseProblemRank, getSubOneVideoSuperviseProblemTypeRate, getSubOneVideoSuperviseTrend } from "@/api/screen/subScreen/videoSupervise.ts"; const time = ref([ @@ -309,9 +307,9 @@ const getMap = async (timeValue) => { } -const getProblemTypeRate = async (timeValue) => { - const res = await getVideoSuperviseProblemTypeRate(timeValue); - ProblemTypeRateChart.value.series[0].data = res.videoSuperviseProblemTypeRate +const getProblemTypeRate = async (departId, timeValue) => { + const res = await getSubOneVideoSuperviseProblemTypeRate(departId, timeValue); + ProblemTypeRateChart.value.series[0].data = res.subOneVideoSuperviseProblemTypeRate } @@ -333,6 +331,7 @@ const getData = async () => { getRankList(currentDepartId, time.value); // getMap(time.value) getTrend(currentDepartId, selectedYear.value) + getProblemTypeRate(currentDepartId, time.value) // getProblemTypeRate(time.value); getMapJSON(currentDepartId) } @@ -348,7 +347,7 @@ onMounted(() => { }) const handleCommand = (year) => { selectedYear.value = year; // 更新当前选中的年份 - getTrend(selectedYear.value) + getTrend(currentDepartId, year) }; // endregion