Selaa lähdekoodia

Merge branch 'dev' into feat_map

zhouyuhao 11 kuukautta sitten
vanhempi
commit
8e1e859245

+ 2 - 1
src/auto-imports.d.ts

@@ -3,6 +3,7 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
+// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -68,6 +69,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

+ 2 - 2
src/components/ContainerStatus/src/ContainerStatus.vue

@@ -75,7 +75,7 @@ watch(
   height: 100%;
   overflow: auto;
   .container {
-    height: 394px;
+    height: 358px;
     padding-bottom: 8px;
     overflow: auto;
   }
@@ -83,7 +83,7 @@ watch(
     display: flex;
     flex-direction: column;
     align-items: center;
-    height: 394px;
+    height: 358px;
     .el-image {
       width: 200px;
       height: 200px;

+ 3 - 0
src/views/Booking/src/components/BookingDetail/src/components/EmailView.vue

@@ -291,6 +291,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;

+ 6 - 0
src/views/Layout/src/components/Header/HeaderView.vue

@@ -214,6 +214,9 @@ const handleLogin = () => {
 
 <style lang="scss" scoped>
 .header-avatar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 24px;
   height: 24px;
   padding: 2px;
@@ -273,6 +276,9 @@ div.el-popover.el-popper.user-config-popover {
     height: 70px;
     border-bottom: 1px solid #eeeeed;
     & > .avatar {
+      display: flex;
+      align-items: center;
+      justify-content: center;
       width: 48px;
       height: 48px;
       padding-top: 7px;

+ 3 - 0
src/views/Tracking/src/components/TrackingDetail/src/components/EmailDrawer.vue

@@ -296,6 +296,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;