diff --git a/src/views/Main/DailyPatrolCard/index.vue b/src/views/Main/DailyPatrolCard/index.vue
index e7ac102..06bbc79 100644
--- a/src/views/Main/DailyPatrolCard/index.vue
+++ b/src/views/Main/DailyPatrolCard/index.vue
@@ -4,10 +4,12 @@
-
问题处理进度:{{progressCount}}%
+
+ 问题处理进度:{{ progressCount }}%
+
@@ -40,7 +42,7 @@ const handleResize = () => {
};
const dailyData: any = ref([]);
const dailyCount = ref(0);
-const progressCount = ref(0)
+const progressCount = ref(0);
const getChartData = async (time: any) => {
dailyCount.value = 0;
dailyData.value = [];
@@ -50,7 +52,7 @@ const getChartData = async (time: any) => {
...time,
group: 'K6'
};
- const data: any = chartStore.initStatisticChart(pramas);
+ const data: any = await chartStore.initStatisticChart(pramas);
if (data?.yaxis?.length) {
let newArr = data.yaxis.flatMap((v: any) => v.series);
newArr?.forEach((item: any) => {
@@ -243,11 +245,12 @@ watch(
() => props.timeRange,
(newVal) => {
getChartData(newVal);
- getProgressData(newVal)
+ getProgressData(newVal);
}
);
onMounted(() => {
- // getChartData(props.timeRange);
+ getChartData(props.timeRange);
+ getProgressData(props.timeRange);
window.addEventListener('resize', handleResize);
});
diff --git a/src/views/Main/MonitoringCard/index.vue b/src/views/Main/MonitoringCard/index.vue
index 28d9528..3f1bbcb 100644
--- a/src/views/Main/MonitoringCard/index.vue
+++ b/src/views/Main/MonitoringCard/index.vue
@@ -13,17 +13,17 @@
{{ chartData.cz || 0 }}
-
测站数量
+
水文工程检测测站数量
{{ chartData.cd || 0 }}
-
测点数量
+
水文工程检测测点数量
{{ chartData.yx || 0 }}
-
影像监视
+
水事影像监测监视点
@@ -55,13 +55,13 @@ onMounted(() => {
if (item.code === 'YZT_CONSTRUCT_DBAQ_SUM') {
chartData.dbaq = +(+item.sum).toFixed(0);
}
- if (item.code === 'ATT_ST_BASE') {
+ if (item.code === 'YZT_SWGCJCCZ_SUM') {
chartData.cz = +(+item.sum).toFixed(0);
}
- if (item.code === 'ATT_ST_MP') {
+ if (item.code === 'YZT_SWGCJCCD_SUM') {
chartData.cd = +(+item.sum).toFixed(0);
}
- if (item.code === 'ATT_WMST_BASE') {
+ if (item.code === 'YZT_SSYX_SUM') {
chartData.yx = +(+item.sum).toFixed(0);
}
});
diff --git a/src/views/Main/ProjectCountCard/index.vue b/src/views/Main/ProjectCountCard/index.vue
index dfa1e7b..b9556dc 100644
--- a/src/views/Main/ProjectCountCard/index.vue
+++ b/src/views/Main/ProjectCountCard/index.vue
@@ -31,7 +31,7 @@ const getChartData = async () => {
group: 'K1'
};
- const data: any = chartStore.initStatisticChart(pramas)
+ const data: any = await chartStore.initStatisticChart(pramas)
if (data?.yaxis?.length) {
projectData.value = [];
let newArr = data.yaxis.flatMap((v: any) => v.series);
diff --git a/src/views/Main/RiskInspectionCard/index.vue b/src/views/Main/RiskInspectionCard/index.vue
index c64e9bb..22a978b 100644
--- a/src/views/Main/RiskInspectionCard/index.vue
+++ b/src/views/Main/RiskInspectionCard/index.vue
@@ -59,7 +59,7 @@ const getChartData = async (time: any) => {
...time,
group: 'K5'
};
- const data: any = chartStore.initStatisticChart(pramas);
+ const data: any = await chartStore.initStatisticChart(pramas);
if (data?.yaxis?.length) {
let newArr = data.yaxis.flatMap((v: any) => v.series);
newArr?.forEach((item: any) => {