From 49726bc73f8c4764ce23019ce8268c7b7388acda 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: Tue, 19 Nov 2024 02:08:11 +0800
Subject: [PATCH 1/3] ok1.4
---
src/views/datav/SceneInsp.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue
index 23c506e..f49a8e8 100644
--- a/src/views/datav/SceneInsp.vue
+++ b/src/views/datav/SceneInsp.vue
@@ -472,7 +472,7 @@ const option = ref({
整改中 ${dataItem.changing}
已整改 ${dataItem.changed}
涉及单位数 ${dataItem.relationOrg}
- 整改率 ${dataItem.changedRate}
+ 整改率 ${dataItem.changedRate}%
`;
From 6c85b8c7f557acac8a0d55d718d7dc8b00cd6d48 Mon Sep 17 00:00:00 2001
From: kami <605128600@qq.com>
Date: Wed, 20 Nov 2024 15:55:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=AF=B9=E8=B1=A1?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/negative/verify.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index b1bf599..6ba54b2 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -315,7 +315,7 @@
>
案件核查
-
-
-
- 民意感知
-
-
-
-
+
+ 民意感知
+
+
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 33e5b42..c75c2ab 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -52,11 +52,11 @@ export const routes = [
},
{
path: '/datav/jwpy',
- // component: () => import('@/views/datav/Jwpy.vue'),
- beforeEnter: (to, from, next) => {
+ component: () => import('@/views/datav/Jwpy.vue'),
+ /* beforeEnter: (to, from, next) => {
window.open('www.baidu.com', '_blank');
next(false); // 阻止路由的正常内部跳转
- }
+ }*/
},
{
path: '/datav/lmgz',
diff --git a/src/views/datav/Gobal.vue b/src/views/datav/Gobal.vue
index 9fe351c..d0f6148 100644
--- a/src/views/datav/Gobal.vue
+++ b/src/views/datav/Gobal.vue
@@ -141,7 +141,12 @@ import changshaMap from "@/assets/data/changsha.json";
import * as echarts from "echarts/core";
import moment from "moment/moment";
import {getCaseVerifData} from "@/api/datav";
-import {getAllGobalCount, getGobalRecentlyTrendByMonth} from "@/api/data/basicScreen.ts";
+import {
+ getAllGobalCount,
+ getBusinessRate,
+ getGobalRecentlyTrendByMonth,
+ getOrganizationRank, getProblemBusinessRate, getStrongProblemRate
+} from "@/api/data/basicScreen.ts";
// region 各种数据
const activeOrgTab = ref("1");
const fxsjlist = ref([]); // 分县市区机构问题排名
@@ -396,28 +401,36 @@ const time = ref([
]);
function getData() {
- getAllGobalCount(time.value).then((res) => {
- overview.value = res.overview;
+ getOrganizationRank(time.value).then((res) => {
fxsjlist.value = res.fxsjlist;
jsdwlist.value = res.jsdwlist;
+ });
+ getBusinessRate(time.value).then((res) => {
ywzblist.value = res.ywzblist;
- wtlxlist.value = res.wtlxlist;
- tcwtlist.value = res.tcwtlist;
+ });
+ getAllGobalCount(time.value).then((res) => {
+ overview.value = res.overview;
gobalTempMapVoList = res.gobalTempMapVoList;
});
getGobalRecentlyTrendByMonth(new Date().getFullYear()).then((res) => {
proTrend.value.xAxis.data = res.monthList;
proTrend.value.series[0].data = res.totalList;
});
-
+ getStrongProblemRate(time.value).then((res) => {
+ tcwtlist.value = res.tcwtlist;
+ });
+ getProblemBusinessRate(time.value).then((res) => {
+ wtlxlist.value = res.wtlxlist;
+ });
}
-watch(time, () => {
+onMounted(() => {
getData();
});
-onMounted(() => {
+watch(time, () => {
getData();
});
+
const colors = [
{
color: "linear-gradient( 270deg, #FB002D 0%, #822232 100%)",
diff --git a/src/views/datav/Jwpy.vue b/src/views/datav/Jwpy.vue
index 9818c71..afe3c63 100644
--- a/src/views/datav/Jwpy.vue
+++ b/src/views/datav/Jwpy.vue
@@ -93,7 +93,27 @@
-
+
+
业务满意率
+
+
+
+
+
+
+
+
+
@@ -405,6 +425,61 @@ const option3 = {
}
}]
};
+const fontSize = ref(11)
+const headerCellStyle = ref({
+ fontSize: '11px', /* 设置表头字体大小 */
+ color: '#24D2EE', /* 设置表头字体颜色 */
+ backgroundColor: '#04144E', /* 设置表头背景颜色 */
+ height: '15px', /* 设置表头高度 */
+ padding: '0 0 0 0', /* 设置表头内边距 */
+});
+
+const tableRowStyle = (row) => {
+ return {
+ backgroundColor: '#04144E',
+ color: "#FFFFFF"
+ };
+};
+
+
+// 自定义总合行样式
+const summaryCellStyle = () => {
+ return {
+ backgroundColor: '#04144E',
+ color: "#FFFFFF"
+ };
+};
+
+
+// 定义汇总方法
+const getSummaries = (param) => {
+ const {columns, data} = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '总计';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index] += '';
+ } else {
+ sums[index] = 'N/A';
+ }
+ });
+ return sums;
+};
+
+
+
// region 调查情况
const overview = ref({
total: 0,
@@ -485,7 +560,51 @@ const colors = [
},
];
-
+const tableData = [
+ {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ }, {
+ id: '12987122',
+ name: 'Tom',
+ amount1: '234',
+ amount2: '3.2',
+ amount3: 10,
+ },
+]
@@ -519,5 +638,20 @@ const colors = [
height: 118px;
}
+.custom-footer-row {
+ background-color:#FB3131;
+ font-weight: bold;
+ color: #333;
+}
+
+.custom-footer-cell {
+ text-align: center;
+ padding: 10px;
+}
+
+
+
+
+
\ No newline at end of file