refactor(sycm): 生意参谋-解决日期合并问题包括样式

src/views/bi/competitor/components/TableList.vue

@@ -18,7 +18,6 @@
           icon="Histogram"
           @click="changeType()" />
       </el-tooltip>
-
     </right-toolbar>
   </div>
   <el-table :data="data"
@@ -57,7 +56,8 @@
       },
     },
     dateMerge: { // 是否把日期数据合并
-      type: Boolean
+      type: Boolean,
+      default: false
     }
   })
 
@@ -72,7 +72,7 @@
     return result
   }
 
-  const emits = defineEmits(['changeType', 'queryTable', 'dateMergeFn'])
+  const emits = defineEmits(['changeType', 'queryTable', 'dateMerge'])
 
   const queryTable = () => {
     emits('queryTable')
@@ -83,7 +83,7 @@
   }
 
   const dateMergeFn = () => {
-    emits('dateMergeFn')
+    emits('dateMerge')
   }
 
 </script>
@@ -91,6 +91,7 @@
 <style scoped
   style="sass">
   .toolbar {
-    float: right;
+    display: flex;
+    align-items: end;
   }
 </style>
\ No newline at end of file

src/views/bi/competitor/sycm_prd/index.vue

@@ -41,7 +41,7 @@
         </el-date-picker>
       </el-form-item>
     </el-form>
-    <div class="chart_wrap"
+    <div :class="{chart_wrap : showType === 'charts', table_wrap : showType === 'table'}"
       v-loading="loading">
       <template v-if="queryParams.prdList.length > 0 && queryParams.typeList.length > 0 && !loading">
         <template v-if="showType === 'charts'">
@@ -56,7 +56,7 @@
             :dateMerge="dateMerge"
             @changeType="changeType"
             @queryTable="getList"
-            @dateMergeFn="dateMergeFn"></table-list>
+            @dateMerge="dateMergeFn"></table-list>
         </template>
       </template>
       <no-data v-else-if="!loading"></no-data>
@@ -394,4 +394,11 @@ const reset = async () => {
   .prd-select {
     width: 550px;
   }
+
+  .table_wrap {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+  }
+
 </style>
\ No newline at end of file

src/views/bi/competitor/sycm_store/index.vue

@@ -39,7 +39,7 @@
         </el-date-picker>
       </el-form-item>
     </el-form>
-    <div class="chart_wrap"
+    <div :class="{chart_wrap : showType === 'charts', table_wrap : showType === 'table'}"
       v-loading="loading">
       <template v-if="queryParams.brandList.length > 0 && queryParams.typeList.length > 0 && !loading">
         <template v-if="showType === 'charts'">
@@ -386,3 +386,11 @@ const reset = async () => {
   init()
 }
 </script>
+
+<style scoped lang="scss">
+.table_wrap{
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+}
+</style>
\ No newline at end of file