From 56b65acc75aefe00a857f44896ee958b4dad1edf Mon Sep 17 00:00:00 2001 From: pengwei Date: Fri, 13 Jun 2025 16:35:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8C=BA=E5=8E=BF=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=9D=A3=E5=AF=9F=EF=BC=9A1=E3=80=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E2=80=9C=E5=8A=9E=E7=BB=93=E7=8E=87=E2=80=9D=202=E3=80=81?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=96=B0=E5=A2=9E=E2=80=9C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=AE=A2=E6=88=B7=E7=AB=AF=E2=80=9D=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E9=93=BE=E6=8E=A5=E5=8F=82=E8=80=83=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E8=A7=86=E9=A2=91=E7=9D=A3=E5=AF=9F=203=E3=80=81?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=81=9A=E8=BD=AE=E6=92=AD=E6=95=88=E6=9E=9C?= =?UTF-8?q?=204=E3=80=81=E6=80=BB=E8=A7=88=E6=95=B0=E6=8D=AE=E5=8F=82?= =?UTF-8?q?=E8=80=83=E5=B8=82=E5=B1=80=E5=A4=A7=E5=B1=8F=20=205=E3=80=81?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=B3=E4=B8=8A=E5=B7=A6=E4=B8=8A=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=20=206=E3=80=81=E5=85=B6?= =?UTF-8?q?=E5=AE=83=E7=BB=9F=E8=AE=A1=E5=9B=BE=E7=BB=9F=E4=B8=80=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/screen/subScreen/subOneMailVisits.ts | 8 +- .../screen/subScreen/subOneRightsConfort.ts | 25 +- .../subScreen/subOneSupervisionNotify.ts | 3 +- src/components/datav/subOne/subOneHeader.vue | 137 ++++++++ src/views/datav/Global.vue | 5 + src/views/datav/SceneInsp.vue | 12 +- .../datav/subonedatav/SubOneAuditSuper.vue | 3 +- .../datav/subonedatav/SubOneCaseVerif.vue | 25 +- src/views/datav/subonedatav/SubOneGlobal.vue | 21 +- .../datav/subonedatav/SubOneMailVisits.vue | 176 +++++------ .../datav/subonedatav/SubOneRightsComfort.vue | 138 +++++--- .../datav/subonedatav/SubOneSceneInsp.vue | 294 +++++++++--------- .../datav/subonedatav/SubOneVideoInsp.vue | 16 +- 13 files changed, 563 insertions(+), 300 deletions(-) create mode 100644 src/components/datav/subOne/subOneHeader.vue diff --git a/src/api/screen/subScreen/subOneMailVisits.ts b/src/api/screen/subScreen/subOneMailVisits.ts index da9d497..31c1683 100644 --- a/src/api/screen/subScreen/subOneMailVisits.ts +++ b/src/api/screen/subScreen/subOneMailVisits.ts @@ -34,4 +34,10 @@ export function getSubOneEntanglementAndMassMail(departId, times) { return request.get({ url: `/datav/sub1/mailVisits/getSubOneEntanglementAndMassMail?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` }); -} \ No newline at end of file +} +//追责问责情况 +export function getSubOneResultCountFun(departId,times){ + return request.get({ + url: `/datav/sub1/mailVisits/getSubOneResultCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }) +} diff --git a/src/api/screen/subScreen/subOneRightsConfort.ts b/src/api/screen/subScreen/subOneRightsConfort.ts index 34fc1d8..7e6b9a3 100644 --- a/src/api/screen/subScreen/subOneRightsConfort.ts +++ b/src/api/screen/subScreen/subOneRightsConfort.ts @@ -24,4 +24,27 @@ export function getSubOneCaseAriseSituationRate(departId, times) { }); } - +//抚慰情况 +export function getComfortSituation(departId,times){ + return request.get({ + url:`/datav/sub1/rightsComfort/getComfortSituation?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }) +} +//案件类别占比 +export function getSubCaseType(departId,times){ + return request.get({ + url:`/datav/sub1/rightsComfort/getSubCaseType?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }) +} +//打处情况 +export function getPunishmentSituation(departId,times){ + return request.get({ + url:`/datav/sub1/rightsComfort/getPunishmentSituation?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }) +} +//获取地图数据 +export function getSubComfortMapIcon(departId,times){ + return request.get({ + url:`/datav/sub1/rightsComfort/getComfortMapIcon?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + }) +} diff --git a/src/api/screen/subScreen/subOneSupervisionNotify.ts b/src/api/screen/subScreen/subOneSupervisionNotify.ts index e1743fa..16de757 100644 --- a/src/api/screen/subScreen/subOneSupervisionNotify.ts +++ b/src/api/screen/subScreen/subOneSupervisionNotify.ts @@ -1,6 +1,7 @@ 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]}` @@ -19,7 +20,7 @@ export function getSubOneSupervisionTrend(departId, year) { url: `/datav/sub1/supervisonNotify/getSubOneSupervisionTrend?departId=${departId}&year=${year}` }); } - +//监督管理-中央数据 export function getSubOneSupervisionNotifyCount(departId, times) { return request.get({ url: `/datav/sub1/supervisonNotify/getSubOneSupervisionNotifyCount?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` diff --git a/src/components/datav/subOne/subOneHeader.vue b/src/components/datav/subOne/subOneHeader.vue new file mode 100644 index 0000000..cfaa1dc --- /dev/null +++ b/src/components/datav/subOne/subOneHeader.vue @@ -0,0 +1,137 @@ + + + diff --git a/src/views/datav/Global.vue b/src/views/datav/Global.vue index 0596996..b9fbebb 100644 --- a/src/views/datav/Global.vue +++ b/src/views/datav/Global.vue @@ -173,6 +173,11 @@ import { getGlobalTrend, } from "@/api/screen/gobal.ts"; import { mapOrgNameMapping, orgMapping } from "@/enums/orgMapping.js"; +import useUserStore from "@/stores/modules/user"; +const userStore =useUserStore(); + + +console.log('user',userStore.user) // region 各种变量 const router = useRouter(); diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue index 29ff442..001c70e 100644 --- a/src/views/datav/SceneInsp.vue +++ b/src/views/datav/SceneInsp.vue @@ -645,12 +645,11 @@ const option = ref({
${dataItem.originalName}
`; @@ -662,9 +661,8 @@ const option = ref({
  • 通报问题数 -
  • 办理中 -
  • 已办结 -
    • -
  • 涉及单位数 -
    • -
  • 涉及人数 -
    • - +
  • 问责单位数 -
    • +
  • 问责人次 -
    • `; diff --git a/src/views/datav/subonedatav/SubOneAuditSuper.vue b/src/views/datav/subonedatav/SubOneAuditSuper.vue index fdf3784..01e6420 100644 --- a/src/views/datav/subonedatav/SubOneAuditSuper.vue +++ b/src/views/datav/subonedatav/SubOneAuditSuper.vue @@ -1,7 +1,7 @@