Browse Source

fix--视频督察大屏接口sql改代码重构

master
parent
commit
bed431fb14
  1. 13
      src/api/data/supervisionNotify.ts
  2. 44
      src/api/screen/subScreen/subOneVideoSupervise.ts
  3. 29
      src/api/screen/videoSupervise.ts
  4. 7
      src/views/datav/SceneInsp.vue
  5. 27
      src/views/datav/VideoInsp.vue
  6. 34
      src/views/datav/subonedatav/SubOneVideoInsp.vue

13
src/api/data/supervisionNotify.ts

@ -56,9 +56,16 @@ export function getSupervisionNotifyMap(body) {
/**
*
*/
export function getYellowBetDrug(times, dictValue) {
return request.get({
url: `/datav/supervisonNotify/getYellowBetDrug?beginTime=${times[0]}&endTime=${times[1]}&dictValue=${dictValue}`
// export function getYellowBetDrug(times, dictValue) {
// return request.get({
// url: `/datav/supervisonNotify/getYellowBetDrug?beginTime=${times[0]}&endTime=${times[1]}&dictValue=${dictValue}`
// });
// }
export function getYellowBetDrug(body) {
return request.post({
url: `/datav/supervisonNotify/getYellowBetDrug`,
body
});
}

44
src/api/screen/subScreen/subOneVideoSupervise.ts

@ -4,22 +4,48 @@ import request from "@/api/request";
export function getSubOneVideoSuperviseProblemRank(departId,times) {
return request.get({
url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// export function getSubOneVideoSuperviseProblemRank(departId,times) {
// return request.get({
// url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getSubOneVideoSuperviseProblemRank(body) {
return request.post({
url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseProblemRank`,
body
});
}
export function getSubOneAllVideoSuperviseCount(departId,times) {
return request.get({
url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
export function getSubOneAllVideoSuperviseCount(body) {
return request.post({
url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount`,
body
});
}
export function getSubOneVideoSuperviseMap(departId,times) {
return request.get({
url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// export function getSubOneAllVideoSuperviseCount(departId,times) {
// return request.get({
// url: `/datav/sub1/videoSupervise/getSubOneAllVideoSuperviseCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
// export function getSubOneVideoSuperviseMap(departId,times) {
// return request.get({
// url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getSubOneVideoSuperviseMap(body) {
return request.post({
url: `/datav/sub1/videoSupervise/getSubOneVideoSuperviseMap`,
body
});
}

29
src/api/screen/videoSupervise.ts

@ -10,19 +10,36 @@ export function getVideoSuperviseProblemRank(body) {
}
// 视频督察大屏总览数据
export function getAllVideoSuperviseCount(times) {
return request.get({
url: `/datav/videoSupervise/getAllVideoSuperviseCount?beginTime=${times[0]}&endTime=${times[1]}`
// export function getAllVideoSuperviseCount(times) {
// return request.get({
// url: `/datav/videoSupervise/getAllVideoSuperviseCount?beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getAllVideoSuperviseCount(body) {
return request.post({
url: `/datav/videoSupervise/getAllVideoSuperviseCount`,
body
});
}
// 视频督察地图数据
export function getVideoSuperviseMap(times) {
return request.get({
url: `/datav/videoSupervise/getVideoSuperviseMap?beginTime=${times[0]}&endTime=${times[1]}`
// export function getVideoSuperviseMap(times) {
// return request.get({
// url: `/datav/videoSupervise/getVideoSuperviseMap?beginTime=${times[0]}&endTime=${times[1]}`
// });
// }
export function getVideoSuperviseMap(body) {
return request.post({
url: `/datav/videoSupervise/getVideoSuperviseMap`,
body
});
}
// 视频督察问题趋势
export function getVideoSuperviseTrend(year) {
return request.get({

7
src/views/datav/SceneInsp.vue

@ -1027,7 +1027,12 @@ const getSupervisionTrendData = async () => {
proTrend.value.series[0].data = values;
};
const getYellowBetDrugData = async () => {
const res = await getYellowBetDrug(time.value, zxdcProRankTab.value);
const body = {
beginTime: time.value[0],
endTime: time.value[1],
specialSupervision: zxdcProRankTab.value
}
const res = await getYellowBetDrug(body);
rightOverview.value = res.overView;
fxsjYellowBetOverview.value = res.countyOverview;
jsdwYellowBetOverview.value = res.bureauOverview;

27
src/views/datav/VideoInsp.vue

@ -366,8 +366,8 @@ const option = ref({
<ul class="tooltip-ul" >
<li>查实问题数 <span>${dataItem.discoverProblem}</span></li>
<li>办结问题数 <span>${dataItem.completionProblem}</span></li>
<li>涉及单位数 <span>${dataItem.relativeOrg}</span></li>
<li>涉及人数 <span>${dataItem.relativePer}</span></li>
<li>问责单位数 <span>${dataItem.relativeOrg}</span></li>
<li>问责人次<span>${dataItem.relativePer}</span></li>
</ul>
</div>
@ -472,12 +472,20 @@ const getVideoSuperviseProblemRankData = async () => {
jsdwRankList.value = res.jsdwVideoSuperviseProblemRankList;
};
const getAllVideoSuperviseCountData = async (timeValue) => {
const res = await getAllVideoSuperviseCount(timeValue);
const getAllVideoSuperviseCountData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1]
}
const res = await getAllVideoSuperviseCount(body);
overview.value = res.overview;
};
const getVideoSuperviseMapData = async (timeValue) => {
const res = await getVideoSuperviseMap(timeValue);
const getVideoSuperviseMapData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1]
}
const res = await getVideoSuperviseMap(body);
const mappedData = mapOrgNameMapping(
res.videoSuperviseMapIconVoList,
"discoverProblem"
@ -524,9 +532,12 @@ const getVideoSuperviseProblemTypeRateData = async (timeValue) => {
const getData = async () => {
getVideoSuperviseProblemRankData();
getAllVideoSuperviseCountData();
getVideoSuperviseMapData();
Promise.all([
getAllVideoSuperviseCountData(time.value),
getVideoSuperviseMapData(time.value),
// getAllVideoSuperviseCountData(time.value),
// getVideoSuperviseMapData(time.value),
getVideoSuperviseTrendData(selectedYear.value),
getVideoSuperviseProblemTypeRateData(time.value)
])

34
src/views/datav/subonedatav/SubOneVideoInsp.vue

@ -457,21 +457,37 @@ const getMapJSON = async (departId) => {
subOneVideoMapChart.value.chart.setOption(option.value);
};
const getSubOneVideoSuperviseProblemRankData = async (departId, timeValue) => {
const res = await getSubOneVideoSuperviseProblemRank(departId, timeValue);
const getSubOneVideoSuperviseProblemRankData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneVideoSuperviseProblemRank(body);
fxsjRankList.value = res.policeVideoSuperviseProblemRankList;
jsdwRankList.value = res.teamVideoSuperviseProblemRankList;
};
const getSubOneAllVideoSuperviseCountData = async (departId, timeValue) => {
const res = await getSubOneAllVideoSuperviseCount(departId, timeValue);
const getSubOneAllVideoSuperviseCountData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneAllVideoSuperviseCount(body);
overview.value = res.overview;
};
//
const titleClickFun =()=>{
window.open("http://65.47.26.34")
}
const getSubOneVideoSuperviseMapData = async (departId, timeValue) => {
const res = await getSubOneVideoSuperviseMap(departId, timeValue);
const getSubOneVideoSuperviseMapData = async () => {
const body = {
beginTime: time.value[0],
endTime: time.value[1],
departId: currentDepartId
}
const res = await getSubOneVideoSuperviseMap(body);
const mappedData = res.videoSuperviseMapIconVoList.map((item) => {
return {
...item,
@ -524,9 +540,9 @@ const getSubOneVideoSuperviseProblemTypeRateData = async (
const getData = async () => {
getMapJSON(currentDepartId);
getSubOneVideoSuperviseProblemRankData(currentDepartId, time.value);
getSubOneAllVideoSuperviseCountData(currentDepartId, time.value);
getSubOneVideoSuperviseMapData(currentDepartId, time.value);
getSubOneVideoSuperviseProblemRankData();
getSubOneAllVideoSuperviseCountData();
getSubOneVideoSuperviseMapData();
getSubOneVideoSuperviseTrendData(currentDepartId, selectedYear.value);
getSubOneVideoSuperviseProblemTypeRateData(currentDepartId, time.value);
};

Loading…
Cancel
Save