品牌加热门 修改 仪表盘接口

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
     })
   }

src/router/routes/asyncRoutes.ts

@@ -65,7 +65,8 @@ export const asyncRoutes: AppRouteRecord[] = [
     component: RoutesAlias.recycle,
     meta: {
       title: '回收站',
-      isHide: true
+      isHide: true,
+      keepAlive: true
     }
   },
   // 备货单相关路由

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

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'"

src/views/dashboard/console/index.vue

@@ -98,7 +98,6 @@
       <!-- 各渠道计数 -->
       <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>
@@ -109,7 +108,6 @@
         <div class="icons1" v-if="!showchannelChart" @click="toggleshowchannelChart">
           <img src="@/assets/img/admin/Vector.png" alt="" />
         </div>
-          
         <!-- </transition> -->
       </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) {