Merge branch 'test'

bms-front/src/layout/components/Sidebar/Logo.vue

@@ -75,10 +75,11 @@ const getLogoTextColor = computed(() => {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 96px;
+      height: 24px;
+      object-fit: contain;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 10px;
     }
 
     & .sidebar-title {
@@ -95,8 +96,10 @@ const getLogoTextColor = computed(() => {
 
   &.collapse {
     .sidebar-logo {
+      width: 32px;
+      height: 32px;
       margin-right: 0px;
     }
   }
 }
-</style>
+</style>

bms-front/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 20000
 })
 
 // request拦截器

bms-front/src/views/report/profit/index.vue

@@ -27,14 +27,14 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-form-item label="订单号" class="filter-item">
+            <el-form-item label="客户名称" class="filter-item">
               <el-input
-                v-model="query.orderNo"
+                v-model="query.customerName"
                 type="textarea"
                 :rows="3"
                 resize="vertical"
                 clearable
-                placeholder="输入订单号，多个值请换行"
+                placeholder="输入客户名称，多个值请换行"
                 class="filter-control multi-line-filter"
               />
             </el-form-item>
@@ -53,14 +53,14 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-form-item label="客户名称" class="filter-item">
+            <el-form-item label="订单号" class="filter-item">
               <el-input
-                v-model="query.customerName"
+                v-model="query.orderNo"
                 type="textarea"
                 :rows="3"
                 resize="vertical"
                 clearable
-                placeholder="输入客户名称，多个值请换行"
+                placeholder="输入订单号，多个值请换行"
                 class="filter-control multi-line-filter"
               />
             </el-form-item>