From 6e27857edefe643cbe41c93e1f88c1f3bf0e69a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?= =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com> Date: Wed, 4 Dec 2024 18:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A0=B7=E5=BC=8F=20=20?= =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/screen/mail.ts | 30 ++ src/api/screen/rightsComfort.ts | 5 - src/api/screen/sub1.ts | 7 + src/views/datav/Gobal.vue | 33 +- src/views/datav/MailVisits.vue | 655 +++++++++++++++++++++--------- src/views/datav/RightsComfort.vue | 3 +- src/views/datav/SceneInsp.vue | 54 ++- src/views/datav/Sub1.vue | 81 ++-- src/views/datav/VideoInsp.vue | 28 +- 9 files changed, 607 insertions(+), 289 deletions(-) create mode 100644 src/api/screen/mail.ts create mode 100644 src/api/screen/sub1.ts diff --git a/src/api/screen/mail.ts b/src/api/screen/mail.ts new file mode 100644 index 0000000..6366b88 --- /dev/null +++ b/src/api/screen/mail.ts @@ -0,0 +1,30 @@ +import request from "../request"; + + + +export function getFirstAndRepeatMail(times) { + return request.get({ + url: `/datav/mailVisits/getFirstAndRepeatMail?beginTime=${times[0]}&endTime=${times[1]}` + }); +} + + + +export function getAllMailCount(times) { + return request.get({ + url: `/datav/mailVisits/getAllMailCount?beginTime=${times[0]}&endTime=${times[1]}` + }); +} + + +export function getMailTrend(year) { + return request.get({ + url: `/datav/mailVisits/getMailTrend?year=${year}` + }); +} + +export function getEntanglementAndMassMail(times) { + return request.get({ + url: `/datav/mailVisits/getEntanglementAndMassMail?beginTime=${times[0]}&endTime=${times[1]}` + }); +} diff --git a/src/api/screen/rightsComfort.ts b/src/api/screen/rightsComfort.ts index 2b4621e..d0074ad 100644 --- a/src/api/screen/rightsComfort.ts +++ b/src/api/screen/rightsComfort.ts @@ -55,11 +55,6 @@ export function getCaseAriseSituationRate(times) { } -export function test() { - return request.get({ - url: `/datav/rightsComfort/test` - }); -} diff --git a/src/api/screen/sub1.ts b/src/api/screen/sub1.ts new file mode 100644 index 0000000..0a32ee1 --- /dev/null +++ b/src/api/screen/sub1.ts @@ -0,0 +1,7 @@ +import request from "../request"; + +export function test(departId) { + return request.get({ + url: `/datav/sub1/test?departId=${departId}` + }); +} \ No newline at end of file diff --git a/src/views/datav/Gobal.vue b/src/views/datav/Gobal.vue index 4490c48..355d6aa 100644 --- a/src/views/datav/Gobal.vue +++ b/src/views/datav/Gobal.vue @@ -174,7 +174,8 @@ const gobalTempMapVoList = ref([ "caseVerifyPro": 11, "mailPro": 11, "policePro": 11, - "reviewPro": 11 + "reviewPro": 11, + "value":200 } ]); // 地图临时数据 @@ -280,20 +281,18 @@ const option = ref({ shadowOffsetY: 0, // 设置垂直阴影位移量为6像素 }, visualMap: { - type: "piecewise", - bottom: 10, - pieces: [ - {min: 0, max: 500, label: "问题数低于500", color: "#4987F6"}, - {min: 501, max: 1000, label: "问题数介于500-1000", color: "#F6A149"}, - {min: 1001, label: "问题数高于1000", color: "#D34343"}, - ], - right: 10, - realtime: false, - orient: "horizontal", + min: 1, + max: 200, + text: ['最高问题数', '最低问题数'], + left: 'right', textStyle: { - color: "#fff", + color: '#fff', }, + realtime: false, calculable: true, + inRange: { + color: ['#4987F6', '#F6A149', '#D34343'] + } }, series: [ { @@ -453,12 +452,16 @@ function getData() { return { ...item, originalName: item.name, // 添加原始名称 - name: name, value: item.totalPro, + name: name, + value: item.totalPro, }; }); + const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current); + const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current); gobalTempMapVoList.value = mappedData; - // gobalTempMapVoList.value = res.gobalTempMapVoList; - option.value.series[0].data = mappedData; + option.value.series[0].data = gobalTempMapVoList; + option.value.visualMap.max = maxItem.value; + option.value.visualMap.min = minItem.value; }) } onMounted(() => { diff --git a/src/views/datav/MailVisits.vue b/src/views/datav/MailVisits.vue index 4a8bf5d..55cd344 100644 --- a/src/views/datav/MailVisits.vue +++ b/src/views/datav/MailVisits.vue @@ -10,7 +10,7 @@
- {{ overview.firstMail }} + {{ firstAndRepeatOverview.firstMail }}
初信初访 @@ -20,7 +20,7 @@
- {{ overview.secondMail }} + {{ firstAndRepeatOverview.repeatMail }}
重复信访 @@ -30,7 +30,7 @@
- {{ overview.secondMail }} + {{ firstAndRepeatOverview.leaderMail }}
领导接访数 @@ -68,7 +68,7 @@ +
@@ -157,7 +158,7 @@ /> @@ -174,32 +175,42 @@ + + + + -
- - {{ selectedOption }} 年 +
+ + + {{ selectedYear + " 年" }} + @@ -209,36 +220,114 @@ - + + + +
+
+ {{ mailEntanglementMassOverview.leaderReview }} +
+
+ 领导督办 +
+
+ + +
+
+ {{ mailEntanglementMassOverview.entanglement }} +
+
+ 缠访闹访 +
+
+ + +
+
+ {{ mailEntanglementMassOverview.mass }} +
+
+ 群体集访 +
+
+ + - + - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + { + const res = await getFirstAndRepeatMail(timeValue) + firstAndRepeatOverview.value = res.firstAndRepeatOverview; + fxsjFirstMailList.value = res.fxsjFirstRankList; + fxsjRepeatMailList.value = res.fxsjRepeatRankList; + fxsjLeaderViewMailList.value = res.fxsjLeaderViewRankList; + + bwzdFirstMailList.value = res.bwzdFirstRankList; + bwzdRepeatMailList.value = res.bwzdRepeatRankList; + bwzdLeaderViewMailList.value = -res.bwzdLeaderViewRankList; + +} +const getOverview = async (timeValue = time.value) => { + const res = await getAllMailCount(timeValue) + overview.value = res.overview; +} +const getTrend = async (year = selectedYear.value) => { + const res = await getMailTrend(year); + const policeList = res.policeList; + const manageList = res.manageList; + const numberList = res.numberList; + const countryList = res.countryList; + const policecategories = policeList.map(item => item.name); + const policevalues = policeList.map(item => item.value); + const managecategories = manageList.map(item => item.name); + const managevalues = manageList.map(item => item.value); + const numbercategories = numberList.map(item => item.name); + const numbervalues = numberList.map(item => item.value); + const countrycategories = countryList.map(item => item.name); + const countryvalues = countryList.map(item => item.value); + // 更新图表数据 + policeTrend.value.xAxis.data = policecategories; + policeTrend.value.series[0].data = policevalues; + manageTrend.value.xAxis.data = managecategories; + manageTrend.value.series[0].data = managevalues; + numberTrend.value.xAxis.data = numbercategories; + numberTrend.value.series[0].data = numbervalues; + countryTrend.value.xAxis.data = countrycategories; + countryTrend.value.series[0].data = countryvalues; +} +const getEntangleMassRank = async (timeValue = time.value) => { + const res = await getEntanglementAndMassMail(timeValue) + mailEntanglementMassOverview.value = res.mailEntanglementMassOverview; + fxsjEntanglementMailList.value = res.fxsjEntanglementList; + fxsjMassMailList.value = res.fxsjMassList; + fxsjLeaderReviewMailList.value = res.fxsjLeaderReviewList; + + bwzdLeaderReviewMailList.value = res.bwzdLeaderReviewList; + bwzdEntanglementMailList.value = res.bwzdEntanglementList; + bwzdMassMailList.value = res.bwzdMassList; +} +const getData = async () => { + await getFirstAndRepeatMailRank(); + await getOverview(); + await getTrend(); + await getEntangleMassRank(); +} +// endregion + + +// region 所有图 echarts.registerMap("changsha", changshaMap); let gobalTempMapVoList = [ { @@ -417,12 +617,208 @@ const option = ref({ } ], }) - -const option1 = ref({ +const policeTrend = ref({ + grid: { + left: '5%', // 图表距离容器左边的距离 + right: '2%', // 图表距离容器右边的距离 + top: '10%', // 图表距离容器上边的距离 + bottom: '20%', // 图表距离容器下边的距离 + containLabel: false // 是否包含坐标轴的标签 + }, xAxis: { type: "category", - boundaryGap: false, data: [], + boundaryGap: true, + axisTick: { + // 去掉X轴刻度线 + show: false + }, + }, + yAxis: { + type: "value", + splitLine: { + show: true, + lineStyle: { + color: "#193775", + }, + } + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'line', + label: { + backgroundColor: '#6a7985' + } + } + }, + series: [ + { + type: "line", + smooth: true, + label: { + show: false + }, + lineStyle: { + color: "#28E6FF", + width: 4, + }, + areaStyle: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgba(40,230,255,0.47)", // 渐变起始颜色 + }, + { + offset: 1, + color: "rgba(40,230,255,0)", // 渐变结束颜色 + }, + ]), + }, + data: [], + }, + ], +}); +const manageTrend = ref({ + grid: { + left: '5%', // 图表距离容器左边的距离 + right: '2%', // 图表距离容器右边的距离 + top: '10%', // 图表距离容器上边的距离 + bottom: '20%', // 图表距离容器下边的距离 + containLabel: false // 是否包含坐标轴的标签 + }, + xAxis: { + type: "category", + data: [], + boundaryGap: true, + axisTick: { + // 去掉X轴刻度线 + show: false + }, + }, + yAxis: { + type: "value", + splitLine: { + show: true, + lineStyle: { + color: "#193775", + }, + } + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'line', + label: { + backgroundColor: '#6a7985' + } + } + }, + series: [ + { + type: "line", + smooth: true, + label: { + show: false + }, + lineStyle: { + color: "#28E6FF", + width: 4, + }, + areaStyle: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgba(40,230,255,0.47)", // 渐变起始颜色 + }, + { + offset: 1, + color: "rgba(40,230,255,0)", // 渐变结束颜色 + }, + ]), + }, + data: [], + }, + ], +}); +const numberTrend = ref({ + grid: { + left: '5%', // 图表距离容器左边的距离 + right: '2%', // 图表距离容器右边的距离 + top: '10%', // 图表距离容器上边的距离 + bottom: '20%', // 图表距离容器下边的距离 + containLabel: false // 是否包含坐标轴的标签 + }, + xAxis: { + type: "category", + data: [], + boundaryGap: true, + axisTick: { + // 去掉X轴刻度线 + show: false + }, + }, + yAxis: { + type: "value", + splitLine: { + show: true, + lineStyle: { + color: "#193775", + }, + } + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'line', + label: { + backgroundColor: '#6a7985' + } + } + }, + series: [ + { + type: "line", + smooth: true, + label: { + show: false + }, + lineStyle: { + color: "#28E6FF", + width: 4, + }, + areaStyle: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgba(40,230,255,0.47)", // 渐变起始颜色 + }, + { + offset: 1, + color: "rgba(40,230,255,0)", // 渐变结束颜色 + }, + ]), + }, + data: [], + }, + ], +}); +const countryTrend = ref({ + grid: { + left: '5%', // 图表距离容器左边的距离 + right: '2%', // 图表距离容器右边的距离 + top: '10%', // 图表距离容器上边的距离 + bottom: '20%', // 图表距离容器下边的距离 + containLabel: false // 是否包含坐标轴的标签 + }, + xAxis: { + type: "category", + data: [], + boundaryGap: true, + axisTick: { + // 去掉X轴刻度线 + show: false + }, }, yAxis: { type: "value", @@ -514,163 +910,25 @@ const option3 = { }, ], }; -const activeTab = ref("1"); -const bwzdActiveTab = ref("1"); // 部委支队初重信tab -const activeMailTrend = ref("1"); // 信访趋势tab -const activeMailTab = ref("1"); -const activeTabRight = ref("1"); -const activeMailTabRight = ref("1"); -// 总数对象 -const overview = ref({ - total: 0, - countryMail: 0, - policeMail: 0, - commissionerMail: 0, - numMail: 0, - firstMail: 0, - secondMail: 0, - leaderReceiveMail: 0, - leaderViewMail: 0, - tangleMail: 0, - massMail: 0, -}); -// 分局初重领信 -const fxsjFirstMailList = ref([]); -const fxsjRepeatMailList = ref([]); -const fxsjLeaderViewMailList = ref([]); -// 部委初重信 -const bwzdFirstMailList = ref([]); -const bwzdRepeatMailList = ref([]); -const bwzdLeaderViewMailList = ref([]); -// 分局缠闹 -const fxsjEntanglementMailList = ref([]); -const fxsjMassMailList = ref([]); -// 部委缠闹 -const bwzdEntanglementMailList = ref([]); -const bwzdMassMailList = ref([]); -const time = ref([ - moment().startOf("year").format("YYYY-MM-DD"), - moment().format("YYYY-MM-DD"), -]); - +// endregion -const temp1 = [{ - label: '张三', - value: '1' -}] - -const temp2 = [{ - label: '李四', - value: '1' -}] - - -/** - * 信访趋势 - * @type {Ref, UnwrapRef | string>} - */ -const selectedOption = ref('2024'); -const handleCommand = async (command) => { - selectedOption.value = `${command}`; - if (activeMailTrend.value === "1" || activeMailTrend.value === "2") { - const recentlyMailTrend = await getRecentlyMailTrend({ - sourcesCode: activeMailTab.value, - year: command, - startTime: time.value[0], - endTime: time.value[1] - }); // 获取最近信访趋势 - // 更新图表的 xAxis 和 series 数据 - option1.value.xAxis.data = recentlyMailTrend.monthList; - option1.value.series[0].data = recentlyMailTrend.totalList; - } - if (activeMailTrend.value === "3") { - } - if (activeMailTrend.value === "4") { - const recentlyMailTrend = await getRecentlyMailTrend12337({ - year: selectedOption.value, - startTime: time.value[0], - endTime: time.value[1] - }) - option1.value.xAxis.data = recentlyMailTrend.monthList; - option1.value.series[0].data = recentlyMailTrend.totalList; - } +const handleCommand = (year) => { + selectedYear.value = year; + getTrend() }; // 监听信访趋势tab切换 -watch(activeMailTrend, async () => { - if (activeMailTrend.value <= 2) { - const recentlyMailTrend = await getRecentlyMailTrend({ - sourcesCode: activeMailTrend.value, - year: selectedOption.value, - startTime: time.value[0], - endTime: time.value[1] - }); - option1.value.xAxis.data = recentlyMailTrend.monthList; - option1.value.series[0].data = recentlyMailTrend.totalList; - } - if (activeMailTrend.value === "3") { - option1.value.xAxis.data = null; - option1.value.series[0].data = null; - } - if (activeMailTrend.value === "4") { - const recentlyMailTrend = await getRecentlyMailTrend12337({ - year: selectedOption.value, - startTime: time.value[0], - endTime: time.value[1] - }) - option1.value.xAxis.data = recentlyMailTrend.monthList; - option1.value.series[0].data = recentlyMailTrend.totalList; - } -}) - - -/** - * 初始化 - */ -let timer; -const currentYear = new Date().getFullYear(); - -function initRecentlyMailTrend() { - getRecentlyMailTrend({ - sourcesCode: "1", - year: currentYear, - startTime: time.value[0], - endTime: time.value[1] - }).then((data) => { - // 更新图表的 xAxis 和 series 数据 - option1.value.xAxis.data = data.monthList; - option1.value.series[0].data = data.totalList; - }); -} - watch(time, () => { getData(); - // initRecentlyMailTrend() }) onMounted(() => { getData(); - initRecentlyMailTrend(); // timer = setInterval(() => { // activeMailTab.value = (parseInt(activeMailTab.value) % 3 + 1).toString(); // console.log("Active Tab: ", activeMailTab.value); // }, 3000); // 每3秒切换一次 }); -function getData() { - getMailVisitsData(time.value).then((data) => { - overview.value = data.overview; - fxsjFirstMailList.value = data.fxsjFirstMailList; - fxsjRepeatMailList.value = data.fxsjRepeatMailList; - fxsjLeaderViewMailList.value = data.fxsjLeaderViewMailList; - bwzdFirstMailList.value = data.bwzdFirstMailList; - bwzdRepeatMailList.value = data.bwzdRepeatMailList; - bwzdLeaderViewMailList.value = data.bwzdLeaderViewMailList; - fxsjEntanglementMailList.value = data.fxsjEntanglementMailList - fxsjMassMailList.value = data.fxsjMassMailList - bwzdEntanglementMailList.value = data.bwzdEntanglementMailList - bwzdMassMailList.value = data.bwzdMassMailList - }); -} const colors = [ { @@ -764,4 +1022,25 @@ const colors = [ } +.test { + width: 95px; + height: 25px; + background: #1C3472; +} + +.gobal-dropdown-container { + position: absolute; + right: 20px; + top: 15px; +} + +.my-gobal-yearselect { + font-size: 14px; + padding-top: 6px; + padding-left: 20px; + width: 90px; + color: #fff; +} + + \ No newline at end of file diff --git a/src/views/datav/RightsComfort.vue b/src/views/datav/RightsComfort.vue index 347b24d..c890005 100644 --- a/src/views/datav/RightsComfort.vue +++ b/src/views/datav/RightsComfort.vue @@ -219,7 +219,7 @@ import { getALlComfortCount, getPunishmentSituation, getComfortSituation, - getRightsAndComfortRank, getPoliceHurtSituationAndHurtType, getCaseAriseSituationRate,test + getRightsAndComfortRank, getPoliceHurtSituationAndHurtType, getCaseAriseSituationRate } from "@/api/screen/rightsComfort.ts"; // const temp = ref({ @@ -575,7 +575,6 @@ watch(time, () => { }) onMounted(() => { getData(); - test() }); diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue index d7093d9..eb50a04 100644 --- a/src/views/datav/SceneInsp.vue +++ b/src/views/datav/SceneInsp.vue @@ -886,7 +886,6 @@ const jsdwCheckBeerOverview = ref({ const fxsjCheckBeerRankList = ref([]) // 工作日测酒排行分县市局 const jsdwCheckBeerRankList = ref([]) // 工作日测酒排行局属单位 - const messages = ref([ { type: '', @@ -913,11 +912,13 @@ const messages = ref([ date: '2024-06-06 09:04' } ]); - +const currentYear = new Date().getFullYear(); +const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表 +const selectedYear = ref('2024'); // 当前选中的年份 // endregion -// region 问题类型占比环形图 +// region 所有图表 const wtlxPieOption = computed(() => { return { tooltip: { @@ -935,12 +936,8 @@ const wtlxPieOption = computed(() => { ], }; }); -// endregion - -// region 地图相关 -echarts.registerMap("changsha", changshaMap); -let superviseTempMapVoList = ref([]); echarts.registerMap("changsha", changshaMap); +const superviseTempMapVoList = ref([]); const option = ref({ geo: { map: "changsha", @@ -984,24 +981,18 @@ const option = ref({ }, visualMap: { - - type: "piecewise", - bottom: 10, - pieces: [ - {gte: 0, lte: 500, label: "问题数低于500"}, - {gte: 501, lte: 1000, label: "问题数介于500-1000"}, - {gte: 1000, label: "问题数高于1000"}, - ], - right: 10, - realtime: false, - orient: "horizontal", + min: 1, + max: 200, + text: ['最高问题数', '最低问题数'], + left: 'right', textStyle: { - color: "#fff", + color: '#fff', }, + realtime: false, calculable: true, inRange: { - color: ["#4987F6", "#F6A149", "#D34343",], - }, + color: ['#4987F6', '#F6A149', '#D34343'] + } }, series: [ { @@ -1028,10 +1019,6 @@ const option = ref({ } ], }) -// endregion - - -// region 问题趋势线状图 const proTrend = ref({ grid: { left: '5%', // 图表距离容器左边的距离 @@ -1094,9 +1081,11 @@ const proTrend = ref({ }, ], }); -const currentYear = new Date().getFullYear(); -const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表 -const selectedYear = ref('2024'); // 当前选中的年份 +// endregion + + + + const handleCommand = (year) => { selectedYear.value = year; // 更新当前选中的年份 getSupervisionTrend(year).then(res => { @@ -1108,7 +1097,7 @@ const handleCommand = (year) => { proTrend.value.series[0].data = values; }); }; -// endregion + // region 初始化数据 @@ -1136,7 +1125,6 @@ function getData() { jsdwRankOverview.value = res.jsdwRankOverview; fxsjChangedRankList.value = res.fxsjChangedRankList; jsdwChangedRankList.value = res.jsdwChangedRankList; - // rankOverview.value = res.rankOverview; // data1.value = res.changedRankList; }); @@ -1196,8 +1184,12 @@ function getData() { value: item.totalPro, }; }); + const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current); + const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current); superviseTempMapVoList.value = mappedData; option.value.series[0].data = mappedData; + option.value.visualMap.max = maxItem.value; + option.value.visualMap.min = minItem.value; }) getProblemTypeRate(time.value).then((res) => { diff --git a/src/views/datav/Sub1.vue b/src/views/datav/Sub1.vue index 96f863a..3df51ca 100644 --- a/src/views/datav/Sub1.vue +++ b/src/views/datav/Sub1.vue @@ -546,7 +546,9 @@ const time = ref([ moment().format("YYYY-MM-DD"), ]); // 时间范围 const router = useRouter() +const route = useRoute(); import geoJson from "@/assets/data/浏阳市.json"; +import {test} from "@/api/screen/sub1.ts"; echarts.registerMap("浏阳市", geoJson); const option = ref({ @@ -558,39 +560,39 @@ const option = ref({ formatter: function (params) { // console.log(params); // const dataItem = gobalTempMapVoList.value.find(item => item.name.includes(params.name.substring(0, 2))); - // if (dataItem) { - // return ` - //
- //
${dataItem.originalName}
- //
- //
    - //
  • 问题总数 ${dataItem.totalPro}
    • - //
  • 督察问题 ${dataItem.supervisePro}
    • - //
  • 案件核查问题 ${dataItem.caseVerifyPro}
    • - //
  • 信访投诉问题 ${dataItem.mailPro}
    • - //
  • 民意感知问题 ${dataItem.policePro}
    • - //
  • 审计督察问题 ${dataItem.reviewPro}
    • - //
- //
- //
`; - // } else { - // return ` - //
- //
${dataItem.originalName}
- //
- //
    - //
  • 问题总数 0000
    • - //
  • 督察问题 0000
    • - //
  • 案件核查问题 0000
    • - //
  • 信访投诉问题 0000
    • - //
  • 民意感知问题 0000
    • - //
  • 审计督察问题 0000
    • - // - //
- // - //
- //
`; - // } + // if (dataItem) { + // return ` + //
+ //
${dataItem.originalName}
+ //
+ //
    + //
  • 问题总数 ${dataItem.totalPro}
    • + //
  • 督察问题 ${dataItem.supervisePro}
    • + //
  • 案件核查问题 ${dataItem.caseVerifyPro}
    • + //
  • 信访投诉问题 ${dataItem.mailPro}
    • + //
  • 民意感知问题 ${dataItem.policePro}
    • + //
  • 审计督察问题 ${dataItem.reviewPro}
    • + //
+ //
+ //
`; + // } else { + // return ` + //
+ //
${dataItem.originalName}
+ //
+ //
    + //
  • 问题总数 0000
    • + //
  • 督察问题 0000
    • + //
  • 案件核查问题 0000
    • + //
  • 信访投诉问题 0000
    • + //
  • 民意感知问题 0000
    • + //
  • 审计督察问题 0000
    • + // + //
+ // + //
+ //
`; + // } }, }, @@ -634,7 +636,6 @@ const option = ref({ } ], }) - const option1 = ref({ xAxis: { type: "category", @@ -686,6 +687,18 @@ const option1 = ref({ }, ], }); +const currentDepartId = route.query.departId; +const beginTest = async (departId) => { + const res = await test(departId); + console.log(res) +} + + +onMounted(() => { + // currentDepartId.value = route.query.departId; + beginTest(currentDepartId); +}) +console.log(currentDepartId) function go() { router.push('/datav/sub2') diff --git a/src/views/datav/VideoInsp.vue b/src/views/datav/VideoInsp.vue index 682a180..7735f52 100644 --- a/src/views/datav/VideoInsp.vue +++ b/src/views/datav/VideoInsp.vue @@ -277,8 +277,13 @@ const getMap = async (timeValue) => { value: item.discoverProblem, }; }); + const maxItem = mappedData.reduce((prev, current) => (prev.value > current.value) ? prev : current); + const minItem = mappedData.reduce((prev, current) => (prev.value < current.value) ? prev : current); mapIconList.value = mappedData - console.log(mapIconList.value) + option.value.series[0].data = mapIconList + option.value.visualMap.max = maxItem.value; + option.value.visualMap.min = minItem.value; + // console.log(mapIconList.value) } @@ -427,23 +432,18 @@ const option = ref({ }, visualMap: { - type: "piecewise", - bottom: 10, - pieces: [ - {gte: 0, lte: 500, label: "问题数低于500"}, - {gte: 501, lte: 1000, label: "问题数介于500-1000"}, - {gte: 1001, label: "问题数高于1000"}, - ], - right: 10, - realtime: false, - orient: "horizontal", + min: 1, + max: 200, + text: ['最高问题数', '最低问题数'], + left: 'right', textStyle: { - color: "#fff", + color: '#fff', }, + realtime: false, calculable: true, inRange: { - color: ["#4987F6", "#F6A149", "#D34343",], - }, + color: ['#4987F6', '#F6A149', '#D34343'] + } }, series: [ {