From 65f7f4a123a1b2cbd76fd17636240312ff3579a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Wed, 17 Sep 2025 15:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=8A=A0=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=20=20=E4=BF=AE=E6=94=B9=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/adminApi.ts                   |  18 ++--
 src/router/routes/asyncRoutes.ts      |   3 +-
 src/views/admin/vehicle/brand.vue     |  17 ++++
 src/views/auth/login/index.vue        |   4 +-
 src/views/dashboard/console/index.vue | 138 ++++++++++++++------------
 5 files changed, 107 insertions(+), 73 deletions(-)

diff --git a/src/api/adminApi.ts b/src/api/adminApi.ts
index 043d233..320bfdf 100644
--- a/src/api/adminApi.ts
+++ b/src/api/adminApi.ts
@@ -4,37 +4,43 @@ export class manageService {
   //仪表盘  总
   static statisticswhole() {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/whole'
+      // url: '/admin/inquiry/statistics/whole'
+      url: 'admin/crm/statistics/whole'
     })
   }
   //各渠道统计
   static channelcount() {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/channel/count'
+      // url: '/admin/inquiry/statistics/channel/count'
+      url: '/admin/crm/statistics/channel/count'
     })
   }
   //各国家统计
   static countrycount() {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/country/count'
+      // url: '/admin/inquiry/statistics/country/count'
+      url: '/admin/crm/statistics/country/count'
     })
   }
   //跟单人统计
   static trackcount() {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/track/count'
+      // url: '/admin/inquiry/statistics/track/count'
+      url: '/admin/crm/statistics/track/count'
     })
   }
   //每日录单统计
   static daycount() {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/day/count'
+      // url: '/admin/inquiry/statistics/day/count'
+      url: '/admin/crm/statistics/day/count'
     })
   }
   //每日录单统计
   static inquirycount(params: any) {
     return request.get<any>({
-      url: '/admin/inquiry/statistics/inquiry/count',
+      // url: '/admin/inquiry/statistics/inquiry/count',
+      url: '/admin/crm/statistics/customer/count',
       params
     })
   }
diff --git a/src/router/routes/asyncRoutes.ts b/src/router/routes/asyncRoutes.ts
index 5555b0b..28b7384 100644
--- a/src/router/routes/asyncRoutes.ts
+++ b/src/router/routes/asyncRoutes.ts
@@ -65,7 +65,8 @@ export const asyncRoutes: AppRouteRecord[] = [
     component: RoutesAlias.recycle,
     meta: {
       title: '回收站',
-      isHide: true
+      isHide: true,
+      keepAlive: true
     }
   },
   // 备货单相关路由
diff --git a/src/views/admin/vehicle/brand.vue b/src/views/admin/vehicle/brand.vue
index c4f7891..2d9850e 100644
--- a/src/views/admin/vehicle/brand.vue
+++ b/src/views/admin/vehicle/brand.vue
@@ -46,6 +46,13 @@
               </el-table-column>
               <!-- <el-table-column prop="description" label="描述" show-overflow-tooltip /> -->
               <!-- <el-table-column prop="sort" label="排序" width="80" /> -->
+              <el-table-column label="是否热门" prop="hot">
+                <template #default="scope">
+                  <ElTag :type="scope.row.hot == 1 ? 'danger' : 'info'">
+                    {{ scope.row.hot == 1 ? '是' : '否' }}
+                  </ElTag>
+                </template>
+              </el-table-column>
               <el-table-column label="状态" prop="status">
                 <template #default="scope">
                   <ElTag :type="scope.row.status ? 'success' : 'info'">
@@ -199,6 +206,12 @@
               <ElIcon v-else class="logo-uploader-icon"><Plus /></ElIcon>
             </ElUpload>
           </ElFormItem>
+          <ElFormItem label="是否热门" prop="hot">
+            <el-radio-group v-model="brandForm.hot">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </ElFormItem>
           <ElFormItem label="品牌描述" prop="description">
             <ElInput v-model="brandForm.description" type="textarea" :rows="3" />
           </ElFormItem>
@@ -292,6 +305,7 @@
     brand_code: '',
     brand_name: '',
     logo: '',
+    hot: 0,
     description: '',
     sort: 0,
     status: 1
@@ -344,6 +358,7 @@
         id: row.id,
         brand_code: row.brand_code,
         brand_name: row.brand_name,
+        hot: row.hot,
         logo: row.logo,
         description: row.description,
         sort: row.sort ?? 0,
@@ -355,6 +370,7 @@
         brand_code: '',
         brand_name: '',
         logo: '',
+        hot: 0,
         description: '',
         sort: 0,
         status: 1
@@ -386,6 +402,7 @@
           brand_code: brandForm.brand_code,
           brand_name: brandForm.brand_name,
           logo: brandForm.logo,
+          hot: brandForm.hot,
           description: brandForm.description,
           sort: brandForm.sort,
           status: brandForm.status
diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue
index 83e8c33..ade6b34 100644
--- a/src/views/auth/login/index.vue
+++ b/src/views/auth/login/index.vue
@@ -36,11 +36,11 @@
         <div class="form">
           <!-- 登录方式切换 tab -->
           <div class="login-type-tabs">
-            <!-- <span
+            <span
               :class="{ active: activeLoginType === 'password' }"
               @click="activeLoginType = 'password'"
               >账号密码登录</span
-            > -->
+            >
             <span
               :class="{ active: activeLoginType === 'qrcode' }"
               @click="activeLoginType = 'qrcode'"
diff --git a/src/views/dashboard/console/index.vue b/src/views/dashboard/console/index.vue
index 2065de7..550e534 100644
--- a/src/views/dashboard/console/index.vue
+++ b/src/views/dashboard/console/index.vue
@@ -19,35 +19,35 @@
       <!-- 总体情况 -->
       <div class="flex-d">
         <!-- <transition name="slide-left"> -->
-          <div class="summary-section" v-show="showallChart">
-            <h3 class="section-title" style="margin-bottom: 10px">总体情况</h3>
-            <div class="summary-grid">
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.totals }}</div>
-                <div class="summary-label">总单数</div>
-              </div>
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.channelCount }}</div>
-                <div class="summary-label">渠道总数</div>
-              </div>
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.todayCount }}</div>
-                <div class="summary-label">今日录单</div>
-              </div>
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.releaseCount }}</div>
-                <div class="summary-label">发布人总数</div>
-              </div>
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.countryCount }}</div>
-                <div class="summary-label">国家总数</div>
-              </div>
-              <div class="summary-item">
-                <div class="summary-number">{{ statisticswholedata.trackCount }}</div>
-                <div class="summary-label">跟单人总数</div>
-              </div>
+        <div class="summary-section" v-show="showallChart">
+          <h3 class="section-title" style="margin-bottom: 10px">总体情况</h3>
+          <div class="summary-grid">
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.totals }}</div>
+              <div class="summary-label">总单数</div>
+            </div>
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.channelCount }}</div>
+              <div class="summary-label">渠道总数</div>
+            </div>
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.todayCount }}</div>
+              <div class="summary-label">今日录单</div>
+            </div>
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.releaseCount }}</div>
+              <div class="summary-label">发布人总数</div>
+            </div>
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.countryCount }}</div>
+              <div class="summary-label">国家总数</div>
+            </div>
+            <div class="summary-item">
+              <div class="summary-number">{{ statisticswholedata.trackCount }}</div>
+              <div class="summary-label">跟单人总数</div>
             </div>
           </div>
+        </div>
         <!-- </transition> -->
         <div class="icons1" v-if="!showallChart" @click="showallChart = !showallChart" >
           <img src="@/assets/img/admin/Vector1.png" alt="" />
@@ -60,23 +60,23 @@
       <!-- 发布人计数 -->
       <div class="flex-d">
         <!-- <transition name="slide-left"> -->
-          <div class="chart-section" v-show="showPublisherChart">
-            <div class="chart-header">
-              <h3 class="section-title">询单计数</h3>
-              <div class="chart-controls">
-                <ElSelect
-                  v-model="publisherFilter"
-                  class="filter-select"
-                  @change="updatePublisherChart"
-                >
-                  <ElOption label="全部" value="0" />
-                  <ElOption label="合塑" value="1" />
-                  <ElOption label="派卡" value="3" />
-                </ElSelect>
-              </div>
+        <div class="chart-section" v-show="showPublisherChart">
+          <div class="chart-header">
+            <h3 class="section-title">询单计数</h3>
+            <div class="chart-controls">
+              <ElSelect
+                v-model="publisherFilter"
+                class="filter-select"
+                @change="updatePublisherChart"
+              >
+                <ElOption label="全部" value="0" />
+                <ElOption label="合塑" value="1" />
+                <ElOption label="派卡" value="3" />
+              </ElSelect>
             </div>
-            <div ref="publisherChartRef" class="chart-container"></div>
           </div>
+          <div ref="publisherChartRef" class="chart-container"></div>
+        </div>
         <!-- </transition> -->
         <div class="icons1" v-if="!showPublisherChart" @click="togglePublisherChart" >
           <img src="@/assets/img/admin/Vector1.png" alt="" />
@@ -98,34 +98,32 @@
       <!-- 各渠道计数 -->
       <div class="flex-d-r">
         <!-- <transition name="slide-right"> -->
-          
-          <div class="icons" v-if="showchannelChart" @click="toggleshowchannelChart">
-            <img src="@/assets/img/admin/Vector1.png" alt=""/>
-          </div>
-          <div class="chart-section" v-show="showchannelChart">
-            <h3 class="section-title" style="margin-bottom: 10px">各渠道计数</h3>
-            <div ref="channelChartRef" class="chart-container"></div>
-          </div>
-          <div class="icons1" v-if="!showchannelChart" @click="toggleshowchannelChart">
-            <img src="@/assets/img/admin/Vector.png" alt="" />
-          </div>
-          
+        <div class="icons" v-if="showchannelChart" @click="toggleshowchannelChart">
+          <img src="@/assets/img/admin/Vector1.png" alt=""/>
+        </div>
+        <div class="chart-section" v-show="showchannelChart">
+          <h3 class="section-title" style="margin-bottom: 10px">各渠道计数</h3>
+          <div ref="channelChartRef" class="chart-container"></div>
+        </div>
+        <div class="icons1" v-if="!showchannelChart" @click="toggleshowchannelChart">
+          <img src="@/assets/img/admin/Vector.png" alt="" />
+        </div>
         <!-- </transition> -->
       </div>
       <!-- 每日录单 -->
       <div class="flex-d-r">
         <div class="icons" v-if="showOrdersChart" @click="toggleOrdersChart">
-            <img src="@/assets/img/admin/Vector1.png" alt=""/>
-          </div>
+          <img src="@/assets/img/admin/Vector1.png" alt=""/>
+        </div>
         <!-- <transition name="slide-right"> -->
-          <div class="chart-section" v-show="showOrdersChart">
-            <h3 class="section-title" style="line-height: 36px">每日录单</h3>
-            <div ref="dailyOrdersChartRef" class="chart-container"></div>
-          </div>
+        <div class="chart-section" v-show="showOrdersChart">
+          <h3 class="section-title" style="line-height: 36px">每日录单</h3>
+          <div ref="dailyOrdersChartRef" class="chart-container"></div>
+        </div>
         <!-- </transition> -->
         <div class="icons1" v-if="!showOrdersChart" @click="toggleOrdersChart">
-            <img src="@/assets/img/admin/Vector.png" alt="" />
-          </div>
+          <img src="@/assets/img/admin/Vector.png" alt="" />
+        </div>
       </div>
     </div>
     <!-- 跟单人计数图表区域 -->
@@ -798,7 +796,7 @@
                   : parseInt(params.data.num))
             )
           }
-        },
+        }
       },
       series: [
         {
@@ -810,9 +808,21 @@
             color: '#5D87FF',
             shadowBlur: 15,
             shadowColor: '#5D87FF',
-            borderColor: '#fff',
+            borderColor: '#5D87FF',
             borderWidth: 2
           },
+          label: {
+            show: true, // 显示标签
+            formatter: (params: any) => params.data.num, // 显示数据值
+            position: 'inside', // 标签位置（可选：'top', 'left', 'right', 'bottom', 'inside' 等）
+            color: '#fff', // 标签文字颜色
+            fontSize: 10, // 标签字体大小
+            fontWeight: 'bold', // 标签字体粗细
+            backgroundColor: '#5D87FF', // 背景色
+            borderColor: '#fff',
+            borderRadius: 9, // 圆角
+            padding: [4, 4] // 内边距
+          },
           tooltip: {
             show: true,
             formatter: function (params: any) {