diff --git a/src/views/dataManagement/components/environment/electricity.vue b/src/views/dataManagement/components/environment/electricity.vue index b05df78..0bb7c6a 100644 --- a/src/views/dataManagement/components/environment/electricity.vue +++ b/src/views/dataManagement/components/environment/electricity.vue @@ -38,7 +38,6 @@ const data = ref([]) // 获取图表数据 const fetchData = debounce(() => { - console.log($props, '电量') if ((($props.lab && $props.dateType !== '自定义时间') || ($props.lab && $props.dateType === '自定义时间' && $props.timeRang.length)) && slectPlace.value.length) { loading.value = true getElectricityTrend({ diff --git a/src/views/dataManagement/components/environment/electricity.vue b/src/views/dataManagement/components/environment/electricity.vue index b05df78..0bb7c6a 100644 --- a/src/views/dataManagement/components/environment/electricity.vue +++ b/src/views/dataManagement/components/environment/electricity.vue @@ -38,7 +38,6 @@ const data = ref([]) // 获取图表数据 const fetchData = debounce(() => { - console.log($props, '电量') if ((($props.lab && $props.dateType !== '自定义时间') || ($props.lab && $props.dateType === '自定义时间' && $props.timeRang.length)) && slectPlace.value.length) { loading.value = true getElectricityTrend({ diff --git a/src/views/dataManagement/components/environment/humidity.vue b/src/views/dataManagement/components/environment/humidity.vue index c5e2276..367df4a 100644 --- a/src/views/dataManagement/components/environment/humidity.vue +++ b/src/views/dataManagement/components/environment/humidity.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/components/environment/electricity.vue b/src/views/dataManagement/components/environment/electricity.vue index b05df78..0bb7c6a 100644 --- a/src/views/dataManagement/components/environment/electricity.vue +++ b/src/views/dataManagement/components/environment/electricity.vue @@ -38,7 +38,6 @@ const data = ref([]) // 获取图表数据 const fetchData = debounce(() => { - console.log($props, '电量') if ((($props.lab && $props.dateType !== '自定义时间') || ($props.lab && $props.dateType === '自定义时间' && $props.timeRang.length)) && slectPlace.value.length) { loading.value = true getElectricityTrend({ diff --git a/src/views/dataManagement/components/environment/humidity.vue b/src/views/dataManagement/components/environment/humidity.vue index c5e2276..367df4a 100644 --- a/src/views/dataManagement/components/environment/humidity.vue +++ b/src/views/dataManagement/components/environment/humidity.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/components/environment/temperature.vue b/src/views/dataManagement/components/environment/temperature.vue index dd27aeb..2d8d362 100644 --- a/src/views/dataManagement/components/environment/temperature.vue +++ b/src/views/dataManagement/components/environment/temperature.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/components/environment/electricity.vue b/src/views/dataManagement/components/environment/electricity.vue index b05df78..0bb7c6a 100644 --- a/src/views/dataManagement/components/environment/electricity.vue +++ b/src/views/dataManagement/components/environment/electricity.vue @@ -38,7 +38,6 @@ const data = ref([]) // 获取图表数据 const fetchData = debounce(() => { - console.log($props, '电量') if ((($props.lab && $props.dateType !== '自定义时间') || ($props.lab && $props.dateType === '自定义时间' && $props.timeRang.length)) && slectPlace.value.length) { loading.value = true getElectricityTrend({ diff --git a/src/views/dataManagement/components/environment/humidity.vue b/src/views/dataManagement/components/environment/humidity.vue index c5e2276..367df4a 100644 --- a/src/views/dataManagement/components/environment/humidity.vue +++ b/src/views/dataManagement/components/environment/humidity.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/components/environment/temperature.vue b/src/views/dataManagement/components/environment/temperature.vue index dd27aeb..2d8d362 100644 --- a/src/views/dataManagement/components/environment/temperature.vue +++ b/src/views/dataManagement/components/environment/temperature.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/dataBoard.vue b/src/views/dataManagement/dataBoard.vue index 0d4b57a..9cedb08 100644 --- a/src/views/dataManagement/dataBoard.vue +++ b/src/views/dataManagement/dataBoard.vue @@ -190,7 +190,7 @@ justify-content: center; .content { - width: 98%; + width: 98.5%; margin: 0 auto; border-radius: 6px; diff --git a/src/views/dataManagement/components/environment/electricity.vue b/src/views/dataManagement/components/environment/electricity.vue index b05df78..0bb7c6a 100644 --- a/src/views/dataManagement/components/environment/electricity.vue +++ b/src/views/dataManagement/components/environment/electricity.vue @@ -38,7 +38,6 @@ const data = ref([]) // 获取图表数据 const fetchData = debounce(() => { - console.log($props, '电量') if ((($props.lab && $props.dateType !== '自定义时间') || ($props.lab && $props.dateType === '自定义时间' && $props.timeRang.length)) && slectPlace.value.length) { loading.value = true getElectricityTrend({ diff --git a/src/views/dataManagement/components/environment/humidity.vue b/src/views/dataManagement/components/environment/humidity.vue index c5e2276..367df4a 100644 --- a/src/views/dataManagement/components/environment/humidity.vue +++ b/src/views/dataManagement/components/environment/humidity.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/components/environment/temperature.vue b/src/views/dataManagement/components/environment/temperature.vue index dd27aeb..2d8d362 100644 --- a/src/views/dataManagement/components/environment/temperature.vue +++ b/src/views/dataManagement/components/environment/temperature.vue @@ -119,7 +119,7 @@
- +
diff --git a/src/views/dataManagement/dataBoard.vue b/src/views/dataManagement/dataBoard.vue index 0d4b57a..9cedb08 100644 --- a/src/views/dataManagement/dataBoard.vue +++ b/src/views/dataManagement/dataBoard.vue @@ -190,7 +190,7 @@ justify-content: center; .content { - width: 98%; + width: 98.5%; margin: 0 auto; border-radius: 6px; diff --git a/src/views/dataManagement/environmentBoard.vue b/src/views/dataManagement/environmentBoard.vue index 96aad78..8e4c140 100644 --- a/src/views/dataManagement/environmentBoard.vue +++ b/src/views/dataManagement/environmentBoard.vue @@ -101,6 +101,21 @@ window.addEventListener('resize', () => { calcBlockSize() }) +const startTime = ref() +const calendarChange = (e: any) => { + startTime.value = e[0].getTime() +} +const pickerOptions = (time: any) => { + if (startTime.value) { + const timeRange = 1 * 24 * 60 * 60 * 1000 // 1天时间戳 + const minTime = startTime.value - timeRange * 2 + const maxTime = startTime.value + timeRange * 15 + return time.getTime() <= minTime || time.getTime() >= maxTime || time.getTime() === startTime.value + } + else { + return false + } +}