Merge branch 'xinyan' into test

components.d.ts

@@ -23,70 +23,7 @@ declare module 'vue' {
     DynamicCard: typeof import('./src/components/cardComponents/dynamicCard.vue')['default']
     DynamicTime: typeof import('./src/components/DynamicTime/index.vue')['default']
     Editor: typeof import('./src/components/editor/index.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
-    ElAside: typeof import('element-plus/es')['ElAside']
-    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
-    ElBacktop: typeof import('element-plus/es')['ElBacktop']
-    ElBadge: typeof import('element-plus/es')['ElBadge']
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
-    ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElEmpty: typeof import('element-plus/es')['ElEmpty']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRate: typeof import('element-plus/es')['ElRate']
-    ElRow: typeof import('element-plus/es')['ElRow']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
-    FileDload: typeof import('./src/components/FileDload/index.vue')['default']
     FileDowlander: typeof import('./src/components/FileDowlander/index.vue')['default']
-    FileDownload: typeof import('./src/components/FileDownload/index.vue')['default']
-    FileDownloader: typeof import('./src/components/FileDowlander/FileDownloader.vue')['default']
     FileUploader: typeof import('./src/components/FileUploader/index.vue')['default']
     ForeignKey: typeof import('./src/components/foreignKey/index.vue')['default']
     IconSelector: typeof import('./src/components/iconSelector/index.vue')['default']
@@ -117,8 +54,4 @@ declare module 'vue' {
     TimerBudgetTable: typeof import('./src/components/TimerBudgetTable/index.vue')['default']
     WeekRangePicker: typeof import('./src/components/WeekRangePicker/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

src/views/reportManage/dataCenter/normalDisplay/components/TableDataDisplay.vue

@@ -314,7 +314,8 @@ function handleSortChange({ field, order }) {
     const matchMonth = field.match(/(\d{4}-\d{2})的销售额/);
     const matchTotal = field.match(/当月累计销售额/);
     if (matchRange) {
-      order_date.value = matchRange[1];
+      order_date.value = matchRange[2];
+      console.log("=>(TableDataDisplay.vue:318) order_date.value", order_date.value);
       totalSales.value = '';
     } else if (match) {
       order_date.value = match[1];

src/views/reportManage/dataCenter/utils/enum.ts

@@ -9,7 +9,7 @@ export const dayMetricsEnum = [
   {value: 'acos', label: '广告ACOS'},
   {value: 'roi', label: '广告ROI'},
   {value: 'roas', label: '广告ROAS'},
-    {value: 'tacos', label: 'TACOS'},
+    {value: 'tacos', label: '广告TACOS'},
 ]
 
 export const weekMetricsEnum = [
@@ -31,7 +31,7 @@ export const weekMetricsEnum = [
   { value: 'ad_click_rate', label: '广告点击率'},
   { value: 'ad_conversion_rate', label: '广告转化率'},
   { value: 'conversion_rate', label: '转化率'},
-  {value: 'tacos', label: 'TACOS'},
+  {value: 'tacos', label: '广告TACOS'},
 ]
 
 export const monthMetricsEnum = [
@@ -48,7 +48,7 @@ export const monthMetricsEnum = [
   { value: 'ad_order', label: '广告订单'},
   { value: 'ad_click_rate', label: '广告点击率'},
   { value: 'ad_conversion_rate', label: '广告转化率'},
-  {value: 'tacos', label: 'TACOS'},
+  {value: 'tacos', label: '广告TACOS'},
 ]
 
 export const monthCompareMetricsEnum = [