From 089e40eb1b821b814915ad6e6f3470abf61f2901 Mon Sep 17 00:00:00 2001 From: ruancuihong <2806986110@qq.com> Date: Thu, 13 Mar 2025 19:20:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Main/DailyPatrolCard/index.vue | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/views/Main/DailyPatrolCard/index.vue b/src/views/Main/DailyPatrolCard/index.vue index a02d311..85ace85 100644 --- a/src/views/Main/DailyPatrolCard/index.vue +++ b/src/views/Main/DailyPatrolCard/index.vue @@ -4,10 +4,10 @@
-
问题处理进度：23%
+
问题处理进度：{{progressCount}}%
-
+
@@ -40,6 +40,7 @@ const handleResize = () => { }; const dailyData: any = ref([]); const dailyCount = ref(0); +const progressCount = ref(0) const getChartData = async (time: any) => { dailyCount.value = 0; dailyData.value = []; @@ -220,10 +221,29 @@ const initChart = () => { // Set options and render chart chart.setOption(option); }; +const getProgressData = async (time: any) => { + progressCount.value = 0; + const pramas = { + // endTime: '', + // startTime: '', + ...time, + group: 'K6_1' + }; + const data: any = await chartStore.initStatisticChart(pramas); + if (data?.yaxis?.length) { + let newArr = data.yaxis.flatMap((v: any) => v.series); + newArr?.forEach((item: any) => { + if (item.name == '比例') { + progressCount.value = Number(item.sum) || 0; + } + }); + } +}; watch( () => props.timeRange, (newVal) => { getChartData(newVal); + getProgressData(newVal) } ); onMounted(() => { From f7f0282cc5658bd27db592953733e86bf9917448 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Thu, 13 Mar 2025 19:32:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/web/useProject.tsx | 45 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/hooks/web/useProject.tsx b/src/hooks/web/useProject.tsx index 41845da..86f54af 100644 --- a/src/hooks/web/useProject.tsx +++ b/src/hooks/web/useProject.tsx @@ -3,7 +3,6 @@ import * as SyCim from "sy-cesium-sdk"; import { LayerTypeEnum } from "@/enums/projectEnum"; import { queryLayersByPos } from "@/utils/mapUtils"; import axios from "axios"; -import { throttle } from "lodash-es"; import { useProjectStore } from "@/store/modules/project"; const clustering = reactive({ enabled: true, @@ -275,6 +274,25 @@ const baseLayerActions: Record = { }; export function useLayer() { + const viewerClick = (e: any) => { + const projectStore = useProjectStore(); + const selectedLayers: any = projectStore.selectedLayers; + queryLayersByPos(e.wgs84SurfacePosition, selectedLayers, (res: any) => { + if (res?.attributes?.showCode) { + const { showCode, showName } = res?.attributes; + window.$bus.$emit("open-water-dialog", { + code: showCode, + name: showName, + }); + } + }); + }; + const addViewerClick = () => { + window.viewer?.on(SyCim.MouseEventType.CLICK, viewerClick, window.viewer); + }; + const removeViewerClick = () => { + window.viewer?.off(SyCim.MouseEventType.CLICK, viewerClick, window.viewer); + }; const addLayer = async (layerData: any) => { const { layerType, url, id, isNeedCluster } = layerData; let action = null; @@ -362,7 +380,7 @@ export function useLayer() { } }; const removeLayer = (layerData: any) => { - const { id, layerType } = layerData; + const { id, layerType, isNeedCluster, nameCn } = layerData; if (!layerType) return; const type: any = LayerTypeEnum[layerType as never]; @@ -376,30 +394,15 @@ export function useLayer() { type: SyCim.LayerType[type], } as any); } + + if (isNeedCluster === "1" && nameCn === "水库点") { + removeViewerClick(); + } }; const zoomToLayer = (data: any) => { const { layerType } = data; zoomToLayerActions[layerType as string]?.(data); }; - const viewerClick = (e: any) => { - const projectStore = useProjectStore(); - const selectedLayers: any = projectStore.selectedLayers; - queryLayersByPos(e.wgs84SurfacePosition, selectedLayers, (res: any) => { - if (res?.attributes?.showCode) { - const { showCode, showName } = res?.attributes; - window.$bus.$emit("open-water-dialog", { - code: showCode, - name: showName, - }); - } - }); - }; - const addViewerClick = () => { - window.viewer?.on(SyCim.MouseEventType.CLICK, viewerClick, window.viewer); - }; - const removeViewerClick = () => { - window.viewer?.off(SyCim.MouseEventType.CLICK, viewerClick, window.viewer); - }; return { addLayer, removeLayer, From fe40223c94df15eebf78a35205af419dc36fd8fc Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Thu, 13 Mar 2025 19:50:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E7=BB=9F=E8=AE=A1=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DataStatistics.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/views/Main/ProjectOperation/components/DataStatistics.vue b/src/views/Main/ProjectOperation/components/DataStatistics.vue index c7fa2d2..1a639cd 100644 --- a/src/views/Main/ProjectOperation/components/DataStatistics.vue +++ b/src/views/Main/ProjectOperation/components/DataStatistics.vue @@ -16,7 +16,7 @@ v-model="dateArr" type="daterange" range-separator="至" - value-format="yyyy-MM-dd" + value-format="YYYY-MM-DD" start-placeholder="开始日期" end-placeholder="结束日期" > @@ -85,7 +85,7 @@ const props = defineProps({ const cascaderOptions = ref([]); const showType = ref("1"); const cascaderArr = ref([]); -const dataArr = ref([]); +const dateArr = ref([]); const cascaderProps = { expandTrigger: "hover", label: "stnm", @@ -119,11 +119,10 @@ const echartsRef4 = ref(); function getData() { switch (showType.value) { case "1": - console.log("dataArr.value >> ", dataArr.value); // 处理获取指标数据 getReservoirMonitorIndexData({ - startTime: dataArr.value ? dataArr.value[0] + " 00:00:00" : "", - endTime: dataArr.value ? dataArr.value[1] + " 23:59:59" : "", + startTime: dateArr.value?.length ? dateArr.value[0] + " 00:00:00" : "", + endTime: dateArr.value?.length ? dateArr.value[1] + " 23:59:59" : "", group: "SK", resCode: props.resCode, stcd: cascaderArr.value[0] || "", @@ -255,8 +254,8 @@ function initLineOptions(data: any) { function getEchartsData() { // 水库基本情况 getReservoirCZMonitorEchartsData({ - startTime: dataArr.value ? dataArr.value[0] + " 00:00:00" : "", - endTime: dataArr.value ? dataArr.value[1] + " 23:59:59" : "", + startTime: dateArr.value?.length ? dateArr.value[0] + " 00:00:00" : "", + endTime: dateArr.value?.length ? dateArr.value[1] + " 23:59:59" : "", resCode: props.resCode, stcd: cascaderArr.value[0] || "", mpcd: cascaderArr.value[1] || "", @@ -268,8 +267,8 @@ function getEchartsData() { }); // 环境情况 getReservoirCZMonitorEchartsData({ - startTime: dataArr.value ? dataArr.value[0] + " 00:00:00" : "", - endTime: dataArr.value ? dataArr.value[1] + " 23:59:59" : "", + startTime: dateArr.value?.length ? dateArr.value[0] + " 00:00:00" : "", + endTime: dateArr.value?.length ? dateArr.value[1] + " 23:59:59" : "", resCode: props.resCode, stcd: cascaderArr.value[0] || "", elementType: "ENV", @@ -280,8 +279,8 @@ function getEchartsData() { }); // 应变应力 getReservoirCZMonitorEchartsData({ - startTime: dataArr.value ? dataArr.value[0] + " 00:00:00" : "", - endTime: dataArr.value ? dataArr.value[1] + " 23:59:59" : "", + startTime: dateArr.value?.length ? dateArr.value[0] + " 00:00:00" : "", + endTime: dateArr.value?.length ? dateArr.value[1] + " 23:59:59" : "", resCode: props.resCode, mpcd: cascaderArr.value[1] || "", elementType: "C_STRESS", @@ -322,6 +321,9 @@ onMounted(() => { height: 32px !important; line-height: 32px !important; } + :deep(.sy-range-editor--small) .sy-range-input { + color: rgba(0, 0, 0, 0.9) !important; + } .search-box { display: flex; justify-content: space-between; From 901118235792bac06470db2528c2bba19dd84fa1 Mon Sep 17 00:00:00 2001 From: ruancuihong <2806986110@qq.com> Date: Thu, 13 Mar 2025 20:06:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/theme/element/index.scss | 10 +-- src/theme/index.scss | 4 +- .../components/MonitorWarning.vue | 79 ++++++++++--------- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/theme/element/index.scss b/src/theme/element/index.scss index 962aeaf..ac3337a 100644 --- a/src/theme/element/index.scss +++ b/src/theme/element/index.scss @@ -38,15 +38,15 @@ $--text-color: ( 'disabled': rgba(255, 255, 255, 0.5) ); $--table: ( - 'border-color': transparent, - 'border': none, + // 'border-color': transparent, + // 'border': none, 'text-color': rgba(255, 255, 255, 1), - 'header-text-color': rgba(255, 255, 255, 1), + 'header-text-color': #515a6e, 'row-hover-bg-color': #0acccc, 'current-row-bg-color': rgba(20, 112, 204, 1), - 'header-bg-color': rgba(20, 112, 204, 1), + 'header-bg-color': transparent, 'bg-color': transparent, - 'tr-bg-color': transparent + 'tr-bg-color': transparent, ); $--button: ( diff --git a/src/theme/index.scss b/src/theme/index.scss index a121b8b..5634685 100644 --- a/src/theme/index.scss +++ b/src/theme/index.scss @@ -4,12 +4,12 @@ @use "element-plus/theme-chalk/src/index.scss" as *; @use "./overview.scss" as *; @use "./search.scss" as *; -@use "./date.scss" as *; +// @use "./date.scss" as *; @use "./input.scss" as *; @use "./select.scss" as *; @use "./dialog.scss" as *; @use "./tree.scss" as *; -@use "./table.scss" as *; +// @use "./table.scss" as *; @use "./tabs.scss" as *; @use "./step.scss" as *; @use "./upload.scss" as *; diff --git a/src/views/Main/ProjectOperation/components/MonitorWarning.vue b/src/views/Main/ProjectOperation/components/MonitorWarning.vue index d36a07a..a9950f5 100644 --- a/src/views/Main/ProjectOperation/components/MonitorWarning.vue +++ b/src/views/Main/ProjectOperation/components/MonitorWarning.vue @@ -12,22 +12,21 @@ 开始日期 结束日期
@@ -89,32 +88,32 @@