Browse Source

update

feature
jiangAB 3 weeks ago
parent
commit
e996449376
  1. 8
      public/map/components/CompanyShorePower.vue
  2. 8
      public/map/components/ShorePowerUsage.vue
  3. 15
      public/map/components/ShorePowerUsageSingleData.vue
  4. 8
      public/map/components/ShowData.vue
  5. 3
      public/map/components/charts/ComparisonBarChart.vue
  6. 6
      public/map/index.vue

8
public/map/components/CompanyShorePower.vue

@ -224,10 +224,10 @@ interface TimeRangeOption {
} }
const timeRangeOptions: TimeRangeOption[] = [ const timeRangeOptions: TimeRangeOption[] = [
{ value: 'day', label: '日' }, { value: 'day', label: '日' },
{ value: 'month', label: '月' }, { value: 'month', label: '月' },
{ value: 'year', label: '年' }, { value: 'year', label: '年' },
{ value: 'realtime', label: '总' }, { value: 'realtime', label: '总' },
] ]
const closeShorePowerDetail = () => { const closeShorePowerDetail = () => {

8
public/map/components/ShorePowerUsage.vue

@ -676,10 +676,10 @@ const timeRange = ref<'realtime' | 'day' | 'month' | 'quarter' | 'year'>('day')
// //
const timeRangeOptions = [ const timeRangeOptions = [
{ value: 'day', label: '日' }, { value: 'day', label: '日' },
{ value: 'month', label: '月' }, { value: 'month', label: '月' },
{ value: 'year', label: '年' }, { value: 'year', label: '年' },
{ value: 'realtime', label: '总' }, { value: 'realtime', label: '总' },
] ]
// //

15
public/map/components/ShorePowerUsageSingleData.vue

@ -251,6 +251,7 @@ import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
import WaveLineChart from './charts/WaveLineChart.vue' import WaveLineChart from './charts/WaveLineChart.vue'
import { MapApi } from "@/api/shorepower/map"; import { MapApi } from "@/api/shorepower/map";
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import ComparisonBarChart from './charts/ComparisonBarChart.vue'
import { RealtimeDeviceData } from '@/types/shorepower'; import { RealtimeDeviceData } from '@/types/shorepower';
import { formatTimestamp, parseRangeToTimestamp } from './utils'; import { formatTimestamp, parseRangeToTimestamp } from './utils';
@ -347,19 +348,19 @@ const so2Reduction = ref<string>('0')
// ( vs ) // ( vs )
const yearlyData = [ const yearlyData = [
{ name: '期上期对比', currentValue: 1200, previousValue: 1100 }, { name: '期上期对比', currentValue: 1200, previousValue: 1100 },
// { name: '2025', currentValue: 1300, previousValue: 1250 }, // { name: '2025', currentValue: 1300, previousValue: 1250 },
] ]
// ( vs ) // ( vs )
const monthlyData = [ const monthlyData = [
{ name: '期上期对比', currentValue: 450, previousValue: 420 }, { name: '期上期对比', currentValue: 450, previousValue: 420 },
// { name: '', currentValue: 480, previousValue: 460 }, // { name: '', currentValue: 480, previousValue: 460 },
] ]
// ( vs ) // ( vs )
const dailyData = [ const dailyData = [
{ name: '期上期对比', currentValue: 20, previousValue: 18 }, { name: '期上期对比', currentValue: 20, previousValue: 18 },
// { name: '', currentValue: 15, previousValue: 14 }, // { name: '', currentValue: 15, previousValue: 14 },
] ]
@ -684,10 +685,10 @@ const timeRange = ref<'realtime' | 'day' | 'month' | 'year'>('day')
// //
const timeRangeOptions = [ const timeRangeOptions = [
{ value: 'day', label: '日' }, { value: 'day', label: '日' },
{ value: 'month', label: '月' }, { value: 'month', label: '月' },
{ value: 'year', label: '年' }, { value: 'year', label: '年' },
{ value: 'realtime', label: '总' }, { value: 'realtime', label: '总' },
] ]
// //

8
public/map/components/ShowData.vue

@ -322,10 +322,10 @@ const shipHistoryVisible = ref({
const shipSelectedItem = ref<ShipRespVo | null>(null) const shipSelectedItem = ref<ShipRespVo | null>(null)
const periodOptions = [ const periodOptions = [
{ label: '日', value: 'day' }, { label: '日', value: 'day' },
{ label: '月', value: 'month' }, { label: '月', value: 'month' },
{ label: '年', value: 'year' }, { label: '年', value: 'year' },
{ label: '全部', value: 'realtime' }, { label: '汇总', value: 'realtime' },
] ]
// //

3
public/map/components/charts/ComparisonBarChart.vue

@ -233,9 +233,8 @@ const handleResize = () => {
// //
onMounted(() => { onMounted(() => {
setTimeout(() => {
initChart() initChart()
}, 2000)
window.addEventListener('resize', handleResize) window.addEventListener('resize', handleResize)
}) })

6
public/map/index.vue

@ -43,9 +43,9 @@
:handleGoBack="handleGoBack" /> :handleGoBack="handleGoBack" />
<!-- 港口岸电使用情况单数据 --> <!-- 港口岸电使用情况单数据 -->
<ShorePowerUsageSingleData v-show="activeHeadGroup === 5" :realtime-device-data-time="realtimeDeviceDataTime" <ShorePowerUsageSingleData v-if="activeHeadGroup === 5 && dataLoad"
:realtime-device-data="realtimeDeviceData" :active-head-group="activeHeadGroup" v-if="dataLoad" :realtime-device-data-time="realtimeDeviceDataTime" :realtime-device-data="realtimeDeviceData"
:handleGoBack="handleGoBack" /> :active-head-group="activeHeadGroup" :handleGoBack="handleGoBack" />
<!-- 港口企业岸电使用 --> <!-- 港口企业岸电使用 -->
<!-- <template v-if="activeHeadGroup === 2"> --> <!-- <template v-if="activeHeadGroup === 2"> -->

Loading…
Cancel
Save