Merge branch 'refs/heads/wang' into test

src/App.vue

@@ -55,6 +55,7 @@ const getGlobalI18n = computed(() => {
 });
 // 设置初始化，防止刷新时恢复默认
 onBeforeMount(() => {
+  localStorage.clear();
 	// 设置批量第三方 icon 图标
 	setIntroduction.cssCdn();
 	// 设置批量第三方 js

src/layout/logo/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
 		<!--<span style="font-size: x-large">{{ themeConfig.globalTitle }}</span>-->
-		<span style="font-size: x-large">Ansjer</span>
+		<span class="font-medium text-4xl italic">Ansjer</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
 		<img :src="AnsjerImg" class="layout-logo-size-img"  alt=""/>

src/layout/navMenu/subItem.vue

@@ -8,7 +8,7 @@
 			<sub-item :chil="val.children" />
 		</el-sub-menu>
 		<template v-else>
-			<el-menu-item :index="val.path" :key="val.path">
+			<el-menu-item style="color: #eaeaea" :index="val.path" :key="val.path">
 				<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 					<SvgIcon :name="val.meta.icon" />
 					<span>{{ $t(val.meta.title) }}</span>

src/layout/navMenu/vertical.vue

@@ -6,6 +6,7 @@
 		:collapse="state.isCollapse"
 		:unique-opened="getThemeConfig.isUniqueOpened"
 		:collapse-transition="false"
+    class="font-medium"
 	>
 		<template v-for="val in menuLists">
 			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
@@ -16,7 +17,7 @@
 				<SubItem :chil="val.children" />
 			</el-sub-menu>
 			<template v-else>
-				<el-menu-item :index="val.path" :key="val.path">
+				<el-menu-item style="color: #eaeaea" :index="val.path" :key="val.path">
 					<SvgIcon :name="val.meta.icon" />
 					<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 						<span>{{ $t(val.meta.title) }}</span>

src/stores/themeConfig.ts

@@ -18,7 +18,7 @@ export const useThemeConfig = defineStore('themeConfig', {
        * 全局主题
        */
       // 默认 primary 主题颜色
-      primary: '#409eff',
+      primary: '#3875f6',
       // 是否开启深色模式
       isIsDark: false,
 
@@ -40,7 +40,7 @@ export const useThemeConfig = defineStore('themeConfig', {
       // 默认菜单导航字体颜色
       menuBarColor: '#eaeaea',
       // 默认菜单高亮背景色
-      menuBarActiveColor: 'rgba(0, 0, 0, 0.2)',
+      menuBarActiveColor: '#3c58af',
       // 是否开启菜单背景颜色渐变
       isMenuBarColorGradual: false,
 

src/theme/app.scss

@@ -58,7 +58,8 @@ body,
   }
 
   .layout-aside {
-    background: var(--next-bg-menuBar);
+    //background: var(--next-bg-menuBar);
+    background: #192442;
     box-shadow: 2px 0 6px rgb(0 21 41 / 1%);
     height: inherit;
     position: relative;
@@ -309,7 +310,8 @@ body,
 /* 颜色值
 ------------------------------- */
 .color-primary {
-  color: var(--el-color-primary);
+  //color: var(--el-color-primary);
+  color: #2d5cf6;
 }
 
 .color-success {
@@ -631,4 +633,4 @@ body,
   z-index: 100;
   display: flex;
   justify-content: center;
-}
+}

src/views/searchTerm/asinView/index.vue

@@ -146,52 +146,6 @@ function calculateLastWeek() {
   const firstDay = lastDay.subtract(6, 'day'); // 一周前
   return [firstDay.format('YYYY-MM-DD'), lastDay.format('YYYY-MM-DD')];
 }
-
-// async function handleDownload() {
-//   downloadLoading.value = true;
-//   try {
-//     const body = {
-//       asin: asinInp.value,
-//       date_start: date.value[0],
-//       date_end: date.value[1],
-//       search_term: searchTermInp.value,
-//       marketplace_Ids: marketplaceSelect.value,
-//       report_type: reportTypeSelect.value,
-//     };
-//
-//     const response = await postDownload(body);
-//
-//     const blob = new Blob([response.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-//
-//     // 创建一个临时 URL
-//     const url = window.URL.createObjectURL(blob);
-//
-//     // 创建一个临时的 <a> 元素并触发下载
-//     const link = document.createElement('a');
-//     link.href = url;
-//
-//     // 设置文件名
-//     const currentTime = dayjs().format('YYYY-MM-DD_HH_mm_ss');
-//     const filename = `TopSearchTerm_${currentTime}.xlsx`;
-//
-//     link.setAttribute('download', filename);
-//
-//     // 添加到 body, 触发点击, 然后移除
-//     document.body.appendChild(link);
-//     link.click();
-//     document.body.removeChild(link);
-//
-//     // 释放 URL 对象
-//     window.URL.revokeObjectURL(url);
-//
-//     ElMessage.success('文件下载成功');
-//   } catch (error) {
-//     console.error('==Error==:', error);
-//     ElMessage.error('文件下载失败，请重试');
-//   } finally {
-//     downloadLoading.value = false;
-//   }
-// }
 </script>
 
 <template>

src/views/searchTerm/asinView/useColumns.ts

@@ -237,12 +237,6 @@ export const asinColumns = [
     sortable: true,
     slots: { default: 'Reporting_Date_default' }
   },
-  {
-    field: 'ASIN',
-    title: 'ASIN',
-    minWidth: 120,
-    slots: { default: 'ASIN_default' }
-  },
   {
     field: 'departmentName',
     title: '站点名',

src/views/searchTerm/brandView/index.vue

@@ -140,52 +140,6 @@ function calculateLastWeek() {
   const firstDay = lastDay.subtract(6, 'day'); // 一周前
   return [firstDay.format('YYYY-MM-DD'), lastDay.format('YYYY-MM-DD')];
 }
-
-// async function handleDownload() {
-//   downloadLoading.value = true;
-//   try {
-//     const body = {
-//       asin: asinInp.value,
-//       date_start: date.value[0],
-//       date_end: date.value[1],
-//       search_term: searchTermInp.value,
-//       marketplace_Ids: marketplaceSelect.value,
-//       report_type: reportTypeSelect.value,
-//     };
-//
-//     const response = await postDownload(body);
-//
-//     const blob = new Blob([response.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-//
-//     // 创建一个临时 URL
-//     const url = window.URL.createObjectURL(blob);
-//
-//     // 创建一个临时的 <a> 元素并触发下载
-//     const link = document.createElement('a');
-//     link.href = url;
-//
-//     // 设置文件名
-//     const currentTime = dayjs().format('YYYY-MM-DD_HH_mm_ss');
-//     const filename = `TopSearchTerm_${currentTime}.xlsx`;
-//
-//     link.setAttribute('download', filename);
-//
-//     // 添加到 body, 触发点击, 然后移除
-//     document.body.appendChild(link);
-//     link.click();
-//     document.body.removeChild(link);
-//
-//     // 释放 URL 对象
-//     window.URL.revokeObjectURL(url);
-//
-//     ElMessage.success('文件下载成功');
-//   } catch (error) {
-//     console.error('==Error==:', error);
-//     ElMessage.error('文件下载失败，请重试');
-//   } finally {
-//     downloadLoading.value = false;
-//   }
-// }
 </script>
 
 <template>
@@ -256,7 +210,7 @@ function calculateLastWeek() {
           <template v-for="col in brandColumns" #[`${col.field}_default`]="{ row }">
             <div v-if="col.field === 'clickedItemName'">
               <el-tooltip effect="dark" :content="row.clickedItemName" placement="top" :show-after="300" >
-                <div class="line-text font-medium">
+                <div class="line-text">
                   {{ row.clickedItemName }}
                 </div>
               </el-tooltip>

src/views/searchTerm/topSearchTermRank/index.vue

@@ -188,7 +188,7 @@ function handleJump() {
     <!-- table -->
     <el-card shadow="never" class="mt-5">
       <div style="height: 100%; overflow: auto">
-        <el-table :data="tableData" height="795" stripe style="width: 100%">
+        <el-table :data="tableData" height="920" stripe style="width: 100%">
           <el-table-column fixed prop="searchTerm" label="搜索词" width="260">
             <template #header>
               <el-icon style="top: 2px; margin-right: 3px">

src/views/searchTerm/topSearchTermTable/index.vue

@@ -327,7 +327,7 @@ function arraySpanMethod({ row, column, rowIndex, columnIndex }) {
     <!-- table -->
     <el-card shadow="never" class="mt-5">
       <div style="height: 100%; overflow: auto">
-        <el-table :data="tableData" :span-method="arraySpanMethod" height="795" stripe style="width: 100%">
+        <el-table :data="tableData" :span-method="arraySpanMethod" height="920" stripe style="width: 100%">
           <!-- 保持索引是1, 2, 3的顺序 不会收到合并单元格的影响 -->
           <el-table-column fixed type="index" width="50" :index="(index) => Math.floor(index / 3) + 1" />
           <el-table-column prop="searchTerm" label="搜索词" width="260">

src/views/system/login/component/account.vue

@@ -250,7 +250,7 @@ export default defineComponent({
         @keydown.enter="loginClick"
         @click="loginClick"
         :loading="loading.signIn">
-        <span>{{ $t('message.account.accountBtnText') }}</span>
+        <span class="font-medium">{{ $t('message.account.accountBtnText') }}</span>
       </el-button>
       <!--<el-button type="primary" class="login-content-submit" round @click="qrLoginClick"> 企业微信扫码登录</el-button>-->
     </el-form-item>