Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/views/Dashboard/src/DashboardView.vue

@@ -90,7 +90,7 @@ const GetDashboardData = () => {
         GetTop10ODEcharts(Top10DefaultData.value)
         GetCo2EmissionEcharts(Co2OriginDefaultData.value)
         GetCo2DestinationEcharts(Co2DestinationDefaultData.value)
-        GetRevenueEcharts(RevenueDefaultData.value)
+        // GetRevenueEcharts(RevenueDefaultData.value)
       })
     })
 }
@@ -382,86 +382,12 @@ const GetCo2DestinationEcharts = (val: any) => {
 //获取Revenue Spent
 
 const RevenueObj = reactive({
-  bar_title: 'Total: 0',
-  barList: [
-    'DEC,23',
-    'JAN,24',
-    'FEB,24',
-    'MAR,24',
-    'APR,24',
-    'MAY,24',
-    'JUN,24',
-    'JUL,24',
-    'AUG,24',
-    'SEP,24',
-    'OCT,24',
-    'NOV,24'
-  ],
-  barSeries: [
-    {
-      name: 'USD',
-      type: 'bar',
-      data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-      emphasis: {
-        disabled: true,
-        focus: 'none'
-      },
-      itemStyle: {
-        color: '#FF7500',
-        borderRadius: 6
-      },
-      label: {
-        show: false,
-        color: '#646A73',
-        position: 'top',
-        fontFamily: 'Lato-Light',
-        hideWhenMouseLeave: false // 鼠标离开时不隐藏标签
-      }
-    },
-    {
-      name: 'THB',
-      type: 'bar',
-      data: [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-      emphasis: {
-        disabled: true,
-        focus: 'none'
-      },
-      itemStyle: {
-        color: '#FFAC66',
-        borderRadius: 6
-      },
-      label: {
-        show: false,
-        color: '#646A73',
-        position: 'top',
-        fontFamily: 'Lato-Light',
-        hideWhenMouseLeave: false // 鼠标离开时不隐藏标签
-      }
-    },
-    {
-      name: 'SGD',
-      type: 'bar',
-      data: [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-      emphasis: {
-        disabled: true,
-        focus: 'none'
-      },
-      itemStyle: {
-        color: '#FFE3CC',
-        borderRadius: 6
-      },
-      label: {
-        show: false,
-        color: '#646A73',
-        position: 'top',
-        fontFamily: 'Lato-Light',
-        hideWhenMouseLeave: false // 鼠标离开时不隐藏标签
-      }
-    }
-  ],
-  Max: 5,
-  interval: 1,
-  download_name: 'Rvenue',
+  bar_title: '',
+  barList: [],
+  barSeries: [],
+  Max: 0,
+  interval: 0,
+  download_name: '',
   isShowTooltips: true
 })
 const RevenueLoading = ref(true)