Browse Source

11/28/18:16 现场督察重构

main
parent
commit
2e9fd72f18
  1. 33
      src/api/data/supervisionNotify.ts
  2. 9
      src/api/screen/CaseVerif.ts
  3. 4
      src/components/datav/card.vue
  4. 58
      src/components/datav/message.vue
  5. 207
      src/views/datav/CaseVerif.vue
  6. 137
      src/views/datav/Gobal.vue
  7. 57
      src/views/datav/MailVisits.vue
  8. 1432
      src/views/datav/SceneInsp.vue

33
src/api/data/supervisionNotify.ts

@ -55,3 +55,36 @@ export function getYellowBetDrug(times) {
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]}`
});
}

9
src/api/screen/CaseVerif.ts

@ -0,0 +1,9 @@
import request from "../request";
export function getAllCaseVerifCount(times) {
return request.get({
url: `/datav/caseVerif/getAllCaseVerifCount?beginTime=${times[0]}&endTime=${times[1]}`
});
}

4
src/components/datav/card.vue

@ -9,6 +9,8 @@
</div>
</div>
</template>
<script setup>
defineProps({
title: {
@ -20,6 +22,8 @@ defineProps({
}
});
</script>
<style lang="scss" scoped>
.datav-card {
padding: 12px;

58
src/components/datav/message.vue

@ -0,0 +1,58 @@
<!-- Message.vue -->
<template>
<div class="message" :class="type">
<div class="message-title">{{ title }}</div>
<div class="message-content">{{ content }}</div>
<div class="message-footer flex end">
<span>{{ date }}</span>
</div>
</div>
</template>
<script setup>
const props = defineProps( {
type: {
type: String,
default: 'success'
},
title: {
type: String,
required: true
},
content: {
type: String,
required: true
},
date: {
type: String,
required: true
}
})
const messageClass = computed(() => `message ${props.type}`);
</script>
<style scoped>
.message {
padding: 10px;
margin-bottom: 10px;
background: linear-gradient(270deg, rgba(16, 151, 255, 0.1) 0%, rgba(0, 55, 236, 0.87) 100%);
&[type=warning] {
background: linear-gradient(270deg, rgba(255, 190, 16, 0.1) 0%, rgba(236, 84, 0, 0.87) 100%);
}
&[type=success] {
background: linear-gradient(270deg, rgba(91, 216, 9, 0.14) 0%, #28813D 100%);
}
.message-title {
font-size: 14px;
margin-bottom: 10px;
}
.message-content {
margin-bottom: 10px;
}
}
</style>

207
src/views/datav/CaseVerif.vue

@ -45,7 +45,13 @@
autoresize
/>
</datav-tab-item>
<datav-tab-item label="警纪警规" name="3">
<v-charts
style="height: 320px"
:option="fwglPieOption"
autoresize
/>
</datav-tab-item>
</datav-tabs>
</datav-card>
</el-col>
@ -58,27 +64,27 @@
style="width: 16.66%"
/>
<datav-statistic
:value="temp.tempCheckedCaseTotal"
:value="overview.confirmed"
title="查实案件数"
style="width: 16.66%"
/>
<datav-statistic
:value="temp.tempDealPro"
:value="overview.investigateAndPunish"
title="查处问题(个)"
style="width: 16.66%"
/>
<datav-statistic
:value="temp.tempDealPre"
:value="overview.accountablePeopleNumber"
title="问责人次"
style="width: 16.66%"
/>
<datav-statistic
:value="temp.tempDealOrg"
:value="overview.accountableDepartNumber"
title="问责单位数"
style="width: 16.66%"
/>
<datav-statistic
:value="temp.tempRate"
:value="overview.confirmedRate"
value-unit="%"
title="查实率"
style="width: 16.66%"
@ -95,6 +101,19 @@
:option="option1"
autoresize
/>
<div class="gobal-dropdown-container">
<el-dropdown class="test" @command="handleCommand">
<span class="el-dropdown-link my-gobal-yearselect">
{{ selectedYear + " 年" }}
</span>
<template #dropdown>
<el-dropdown-menu style="width: 90px">
<el-dropdown-item v-for="year in years" :key="year" :command="year">{{ year + " " }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
</datav-card>
</el-col>
<el-col :span="6">
@ -131,7 +150,15 @@
/>
</div>
</datav-tab-item>
<datav-tab-item label="停职处理情况" name="2">
<div class="mb-40">
<v-charts
style="height: 340px"
:option="option4"
autoresize
/>
</div>
</datav-tab-item>
</datav-tabs>
</datav-card>
</el-col>
@ -147,7 +174,12 @@ import changshaMap from "@/assets/data/changsha.json";
import * as echarts from "echarts/core";
import moment from "moment";
import {getCaseVerifData, getCaseVerifTrend} from "@/api/datav";
import {getGobalRecentlyTrendByMonth} from "@/api/data/basicScreen.ts";
import {getAllCaseVerifCount} from "@/api/screen/CaseVerif.ts";
const currentYear = new Date().getFullYear();
const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); //
const selectedYear = ref('2024'); //
const time = ref([
moment().startOf("year").format("YYYY-MM-DD"),
moment().format("YYYY-MM-DD"),
@ -155,11 +187,11 @@ const time = ref([
const overview = ref({
total: 0,
confirmed: 0,
investigateAndPunish: 0,
accountablePeopleNumber: 0,
accountableDepartNumber: 0,
confirmedRate: 0,
confirmed: 0, //
investigateAndPunish: 0, //
accountablePeopleNumber: 0, //
accountableDepartNumber: 0, //
confirmedRate: 0, //
});
let gobalTempMapVoList = [
{
@ -252,8 +284,6 @@ const fwglPieList = ref([]);
const jjjgPieList = ref([]);
const ajlyPieList = ref([]);
const ajhcqxList = ref([]);
const temp = ref({
tempCheckedCaseTotal: 0,
tempDealPro: 0,
@ -262,16 +292,25 @@ const temp = ref({
tempRate: 0,
})
setTimeout(() => {
temp.value={
tempCheckedCaseTotal: 292,
tempDealPro: 285,
tempDealPre: 223,
tempDealOrg: 93,
tempRate: 18,
}
}, 1000);
// setTimeout(() => {
// temp.value={
// tempCheckedCaseTotal: 292,
// tempDealPro: 285,
// tempDealPre: 223,
// tempDealOrg: 93,
// tempRate: 18,
// }
// }, 1000);
//
// region ||
const handleCommand = (year) => {
selectedYear.value = year; //
};
watch(time, () => {
getData();
});
// endregion
@ -280,7 +319,7 @@ setTimeout(() => {
function getData() {
getCaseVerifData(time.value).then((data) => {
overview.value = data.overview;
// overview.value = data.overview;
fxsjBarList.value = data.fxsjBarList;
jsdwBarList.value = data.jsdwBarList;
zfbaPieList.value = data.zfbaPieList;
@ -292,9 +331,13 @@ function getData() {
getCaseVerifTrend(time.value, 12).then((data) => {
ajhcqxList.value = data.ajhcqsList;
console.log(ajhcqxList.value)
// console.log(ajhcqxList.value)
});
getAllCaseVerifCount(time.value).then((data) => {
overview.value = data.overview;
console.log(overview.value)
})
}
@ -505,9 +548,20 @@ const option = {
};
const option1 = ref({
grid: {
left: '5%', //
right: '2%', //
top: '10%', //
bottom: '20%', //
containLabel: false //
},
xAxis: {
type: "category",
boundaryGap: false,
boundaryGap: true,
axisTick: {
// X线
show: false
},
data: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月'],
},
yAxis: {
@ -606,85 +660,100 @@ const colors = [
//
.tooltip {
position: relative;
width: 180px;
height: 222px;
width: 160px;
height: 194px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
border: 1px solid #4E8FFF;
margin: -10px -10px -10px -10px;
}
//
////
.tooltip-title {
width: 180px;
width: 160px;
height: 43px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
background: linear-gradient(180deg, #0A2F86 0%, #04154E 100%);
box-shadow: inset 0px -1px 0px 0px #253755;
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
text-align: center; /* 水平居中 */
font-weight: 400;
font-size: 16px;
color: #FFFFFF;
line-height: 22px;
border-bottom: 1px solid #253755; /* 设置下边框 */
}
.tooltip-content {
width: 180px;
height: 172px;
//font-size: 11px;
margin-top: -12px;
background: linear-gradient(180deg, #010457 0%, #031577 100%);
width: 160px;
height: 150px;
background: linear-gradient(180deg, #010457 0%, #031577 100%)
}
.tooltip-content ul {
list-style-type: none; /* 移除默认的小圆点 */
padding: 0;
padding-left: 5px;
margin: 0;
}
.tooltip-content ul li {
margin-left: 5px;
height: 25px;
height: 24px;
color: #597AE9;
font-size: 13px;
font-weight: 400;
font-size: 14px;
}
// span
//// span
.tooltip-ul span {
float: right;
width: 50px;
text-align: right;
margin-right: 10px;
width: 55px;
color: #fff;
font-size: 13px;
font-size: 14px;
text-align: center; /* 水平居中 */
}
/* 小尖角 */
.tooltip::before {
content: '';
position: absolute;
top: 90px; /* 调整尖角的垂直位置 */
left: -10px; /* 调整尖角的水平位置 */
width: 0;
height: 0;
//border-top: 10px solid red; /* */
//border-bottom: 10px solid green; /* */
//border-right: 10px solid blue; /* */
}
///* */
//.tooltip::before {
// content: '';
// position: absolute;
// top: 90px; /* */
// left: -10px; /* */
// width: 0;
// height: 0;
// //border-top: 10px solid red; /* */
// //border-bottom: 10px solid green; /* */
// //border-right: 10px solid blue; /* */
//}
}
.gobal-dropdown-container {
position: absolute;
right: 20px;
top: 15px;
}
.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;
}
</style>
<!--<datav-tab-item label="警纪警规" name="3">-->
<!--<v-charts-->
<!-- style="height: 320px"-->
<!-- :option="jjjgPieOption"-->
<!-- autoresize-->
<!--/>-->
<!--</datav-tab-item>-->

137
src/views/datav/Gobal.vue

@ -84,7 +84,7 @@
<div>
<datav-card title="问题趋势">
<v-charts
style="height: 260px;"
style="height: 280px;"
:option="proTrend"
autoresize
/>
@ -103,8 +103,6 @@
</div>
</datav-card>
</div>
</el-col>
<el-col :span="6">
@ -120,7 +118,7 @@
<datav-card title="问题类型占比">
<v-charts
style="height: 360px;"
style="height: 370px;"
:option="wtlxPieOption"
autoresize
/>
@ -177,7 +175,8 @@ const gobalTempMapVoList = ref([
}
]); //
const router = useRouter();
const years = ref(['2024', '2023', '2022']); //
const currentYear = new Date().getFullYear();
const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); //
const selectedYear = ref('2024'); //
// endregion
@ -246,24 +245,36 @@ const option = ref({
<li>案件核查问题 <span>${dataItem.caseVerifyPro}</span></li>
<li>信访投诉问题 <span>${dataItem.mailPro}</span></li>
<li>民意感知问题 <span>${dataItem.policePro}</span></li>
<li>审计督察问题 <span>${dataItem.reviewPro}</span></li>
</ul>
</div>
</div>`;
} else {
return `<div class="tooltip">
<div class="tooltip-title">${dataItem.originalName}</div>
<div class="tooltip-content">
<ul class="tooltip-ul"">
<li>问题总数 <span>0</span></li>
<li>督察问题 <span>0</span></li>
<li>案件核查问题 <span>0</span></li>
<li>信访投诉问题 <span>0</span></li>
<li>民意感知问题 <span>0</span></li>
</ul>
</div>
return `
<div class="tooltip">
<div class="tooltip-title">${dataItem.originalName}</div>
<div class="tooltip-content">
<ul class="tooltip-ul"">
<li>问题总数 <span>0000</span></li>
<li>督察问题 <span>0000</span></li>
<li>案件核查问题 <span>0000</span></li>
<li>信访投诉问题 <span>0000</span></li>
<li>民意感知问题 <span>0000</span></li>
<li>审计督察问题 <span>0000</span></li>
</ul>
</div>
</div>`;
}
},
// backgroundColor: "#031577", //
// borderColor: "#0A2F86",
borderWidth: 0, // 1
borderRadius: 3, // 3
shadowBlur: 0, // 8
shadowOffsetX: 0, // 0
shadowOffsetY: 0, // 6
},
visualMap: {
type: "piecewise",
@ -309,16 +320,20 @@ const option = ref({
// 线
const proTrend = ref({
grid: {
left: '10%', //
right: '10%', //
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",
@ -380,8 +395,12 @@ function getData() {
overview.value = res.overview;
});
getGobalRecentlyTrendByMonth(new Date().getFullYear()).then((res) => {
proTrend.value.xAxis.data = res.monthList;
proTrend.value.series[0].data = res.totalList;
const gobalRecentlyTrendList = res.gobalRecentlyTrendList;
const categories = gobalRecentlyTrendList.map(item => item.name);
const values = gobalRecentlyTrendList.map(item => item.value);
//
proTrend.value.xAxis.data = categories;
proTrend.value.series[0].data = values;
});
getStrongProblemRate(time.value).then((res) => {
tcwtlist.value = res.tcwtlist;
@ -448,8 +467,12 @@ onMounted(() => {
const handleCommand = (year) => {
selectedYear.value = year; //
getGobalRecentlyTrendByMonth(year).then(res => {
proTrend.value.xAxis.data = res.monthList;
proTrend.value.series[0].data = res.totalList;
const gobalRecentlyTrendList = res.gobalRecentlyTrendList;
const categories = gobalRecentlyTrendList.map(item => item.name);
const values = gobalRecentlyTrendList.map(item => item.value);
//
proTrend.value.xAxis.data = categories;
proTrend.value.series[0].data = values;
});
};
watch(time, () => {
@ -458,7 +481,6 @@ watch(time, () => {
// endregion
const colors = [
{
color: "linear-gradient( 270deg, #FB002D 0%, #822232 100%)",
@ -483,77 +505,72 @@ const colors = [
//
.tooltip {
position: relative;
width: 169.88px;
height: 168px;
width: 160px;
height: 194px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
border: 1px solid #4E8FFF;
margin: -10px -10px -10px -10px;
}
//
////
.tooltip-title {
width: 169.88px;
width: 160px;
height: 43px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
background: linear-gradient(180deg, #0A2F86 0%, #04154E 100%);
box-shadow: inset 0px -1px 0px 0px #253755;
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
text-align: center; /* 水平居中 */
font-weight: 400;
font-size: 16px;
color: #FFFFFF;
line-height: 22px;
border-bottom: 1px solid #253755; /* 设置下边框 */
}
.tooltip-content {
width: 170px;
height: 130px;
//font-size: 11px;
margin-top: -12px;
background: linear-gradient(180deg, #010457 0%, #031577 100%);
width: 160px;
height: 150px;
background: linear-gradient(180deg, #010457 0%, #031577 100%)
}
.tooltip-content ul {
list-style-type: none; /* 移除默认的小圆点 */
padding: 0;
padding-left: 5px;
margin: 0;
}
.tooltip-content ul li {
margin-left: 5px;
height: 25px;
height: 24px;
color: #597AE9;
font-size: 13px;
font-weight: 400;
font-size: 14px;
}
// span
//// span
.tooltip-ul span {
float: right;
width: 50px;
text-align: right;
margin-right: 35px;
width: 55px;
color: #fff;
font-size: 13px;
}
font-size: 14px;
text-align: center; /* 水平居中 */
/* 小尖角 */
.tooltip::before {
content: '';
position: absolute;
top: 90px; /* 调整尖角的垂直位置 */
left: -10px; /* 调整尖角的水平位置 */
width: 0;
height: 0;
//border-top: 10px solid red; /* */
//border-bottom: 10px solid green; /* */
//border-right: 10px solid blue; /* */
}
///* */
//.tooltip::before {
// content: '';
// position: absolute;
// top: 90px; /* */
// left: -10px; /* */
// width: 0;
// height: 0;
// //border-top: 10px solid red; /* */
// //border-bottom: 10px solid green; /* */
// //border-right: 10px solid blue; /* */
//}
}
.test {

57
src/views/datav/MailVisits.vue

@ -317,7 +317,7 @@ const option = ref({
<li>信访总件数 <span>${dataItem.total}</span></li>
<li>国家信访 <span>${dataItem.countryTotal}</span></li>
<li>公安部信访 <span>${dataItem.policeTotal}</span></li>
<li>局长信箱 <span>${dataItem.policeTotal}</span></li>
<li>12337信访 <span>${dataItem.numTotal}</span></li>
</ul>
</div>
@ -681,77 +681,56 @@ const colors = [
//
.tooltip {
position: relative;
width: 169.88px;
width: 160px;
height: 178px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
border: 1px solid #4E8FFF;
margin: -10px -10px -10px -10px;
}
//
////
.tooltip-title {
width: 169.88px;
width: 160px;
height: 43px;
background: linear-gradient(180deg, rgba(1, 4, 87, 0.8) 0%, rgba(3, 21, 119, 0.8) 100%);
background: linear-gradient(180deg, #0A2F86 0%, #04154E 100%);
box-shadow: inset 0px -1px 0px 0px #253755;
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
text-align: center; /* 水平居中 */
font-weight: 400;
font-size: 16px;
color: #FFFFFF;
line-height: 22px;
border-bottom: 1px solid #253755; /* 设置下边框 */
}
.tooltip-content {
width: 170px;
height: 132px;
//font-size: 11px;
margin-top: -12px;
background: linear-gradient(180deg, #010457 0%, #031577 100%);
width: 160px;
height: 133px;
background: linear-gradient(180deg, #010457 0%, #031577 100%)
}
.tooltip-content ul {
list-style-type: none; /* 移除默认的小圆点 */
padding: 0;
padding-left: 5px;
margin: 0;
}
.tooltip-content ul li {
margin-left: 5px;
height: 25px;
height: 26px;
color: #597AE9;
font-size: 13px;
font-weight: 400;
font-size: 14px;
}
// span
.tooltip-ul span {
float: right;
width: 30px;
text-align: right;
margin-right: 15px;
width: 55px;
color: #fff;
font-size: 13px;
}
/* 小尖角 */
.tooltip::before {
content: '';
position: absolute;
top: 90px; /* 调整尖角的垂直位置 */
left: -10px; /* 调整尖角的水平位置 */
width: 0;
height: 0;
//border-top: 10px solid red; /* */
//border-bottom: 10px solid green; /* */
//border-right: 10px solid blue; /* */
font-size: 14px;
text-align: center; /* 水平居中 */
}
}

1432
src/views/datav/SceneInsp.vue

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save