AmandaG 1 жил өмнө
parent
commit
bdb05c2417

+ 87 - 0
src/views/Dashboard/src/DashboardView.vue

@@ -354,6 +354,65 @@ const DestinationObj = reactive({
   interval: 0,
   download_name: ''
 })
+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: {
+        focus: 'none'
+      },
+      itemStyle: {
+        color: '#FF7500',
+        borderRadius: 6
+      }
+    },
+    {
+      name: 'THB',
+      type: 'bar',
+      data: [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+      emphasis: {
+        focus: 'none'
+      },
+      itemStyle: {
+        color: '#FFAC66',
+        borderRadius: 6
+      }
+    },
+    {
+      name: 'SGD',
+      type: 'bar',
+      data: [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+      emphasis: {
+        focus: 'none'
+      },
+      itemStyle: {
+        color: '#FFE3CC',
+        borderRadius: 6
+      }
+    }
+  ],
+  Max: 5,
+  interval: 1,
+  download_name: 'Rvenue',
+  isShowTooltips: true
+})
 const DestinationLoading = ref(true)
 const GetCo2DestinationEcharts = (val: any) => {
   dashboardObj.DestinationCo2Top10faultData = val
@@ -1089,6 +1148,11 @@ const ClickParams = (val: any) => {
               </template>
             </VBox_Dashboard>
           </div>
+          <!-- Revenue -->
+          <!-- <div
+            v-else-if="item.title === 'Revenue' && item.switchValue"
+            class="KPI_Pending"
+          > -->
           <div
             v-else-if="
               item.title === 'Recent Status' && item.switchValue && RecentStatusList.length != 0
@@ -1125,6 +1189,29 @@ const ClickParams = (val: any) => {
               </template>
             </VBox_Dashboard>
           </div>
+          <!-- <div class="KPI_Pending">
+            <VBox_Dashboard @changeCancel="changeCancel(item.id)" style="width: 100%">
+              <template #header>
+                <div class="Title_flex">
+                  Revenue Spent
+                  <DashFilters
+                    :defaultData="Co2DestinationDefaultData"
+                    @FilterSearch="GetCo2DestinationEcharts"
+                  ></DashFilters>
+                </div>
+              </template>
+              <template #content>
+                <BarChart
+                  ref="seller_chart_CO2_destination"
+                  :BarData="RevenueObj"
+                  v-vloading="DestinationLoading"
+                  style="height: 300px"
+                  @clickParams="ClickParams(item.title)"
+                  :barHeight="{ height: '300px' }"
+                ></BarChart>
+              </template>
+            </VBox_Dashboard>
+          </div> -->
         </template>
       </VueDraggable>
     </div>

+ 1 - 1
src/views/Dashboard/src/components/BarChart.vue

@@ -77,7 +77,7 @@ const initOption = reactive({
   grid: {
     top: '18%',
     left: '1%',
-    right: '6%',
+    right: '2%',
     bottom: '5%',
     containLabel: true // 距离包含坐标轴上的文字
   },

BIN
src/views/Dashboard/src/image/xiazai.png


+ 1 - 4
src/views/Tracking/src/TrackingView.vue

@@ -639,10 +639,7 @@ const SearchInput = () => {
     <FilterTags :TagsListItem="TagsList" @changeTag="changeTag"></FilterTags>
     <div class="heaer_top">
       <div class="search">
-        <el-input
-          placeholder="Search booking No./HBL No./PO No./Carrier Booking No."
-          v-model="TrackingSearch"
-        >
+        <el-input placeholder="Search shipment No./reference No...." v-model="TrackingSearch">
           <template #prefix>
             <span class="iconfont_icon">
               <svg class="iconfont" aria-hidden="true">