Merge branch 'xinyan' into test

src/views/reportManage/dataCenter/normalDisplay/components/Selector/index.vue

@@ -149,11 +149,11 @@ defineExpose({ fetchFilteredData, filteredData, updateData });
 
 <template>
   <div class="flex gap-2.5 flex-wrap">
-    <el-input v-model="platformNumberList" class="flex-item" clearable placeholder="平台编号" style="width: 150px;"
+    <el-input v-model="platformNumberList" class="flex-item" clearable placeholder="平台编号" style="width: 150px;height: 30px"
               @change="emitChange"></el-input>
-    <el-input v-model="platformNameList" class="flex-item" clearable placeholder="平台名称" style="width: 150px;"
+    <el-input v-model="platformNameList" class="flex-item" clearable placeholder="平台名称" style="width: 150px;height: 30px"
               @change="emitChange"></el-input>
-    <el-input v-model="operationList" class="flex-item" clearable placeholder="运营" style="width: 150px;" @change="emitChange"></el-input>
+    <el-input v-model="operationList" class="flex-item" clearable placeholder="运营" style="width: 150px;height: 30px" @change="emitChange"></el-input>
     <el-select
         v-model="usersList"
         class="flex-item"
@@ -162,7 +162,7 @@ defineExpose({ fetchFilteredData, filteredData, updateData });
         clearable
         collapse-tags
         placeholder="填写人"
-        style="width: 180px;"
+        style="width: 160px;"
     >
       <el-option
           v-for="item in usersOptions"
@@ -171,7 +171,7 @@ defineExpose({ fetchFilteredData, filteredData, updateData });
           :value="item.value"
       />
     </el-select>
-    <el-select v-model="countryList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple placeholder="国家" style="width: 150px;">
+    <el-select v-model="countryList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple placeholder="国家" style="width: 160px;">
       <el-option v-for="item in countryOptions" :key="item" :label="item" :value="item" />
       <template #footer>
         <el-button text size="small" @click="selectCommonGroup1">美洲区</el-button>

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

@@ -746,8 +746,8 @@ onMounted(() => {
 
 <template>
   <div>
-    <el-card class=" my-3 mx-8">
-      <div class="custom-card-style flex gap-1.5 justify-between my-1.5 mx-2">
+    <el-card class=" my-3 mx-8 p-0">
+      <div class="flex gap-1.5 justify-between mx-2 items-center">
         <Selector ref="selectorRef" @update:updateData="updateDataChange" />
         <div v-if="dateType === 'day'" class="demo-date-picker">
           <div class="block">
@@ -918,21 +918,11 @@ onMounted(() => {
 <style lang="scss" scoped>
 .demo-date-picker {
   display: flex;
-  width: 50%;
-  padding: 0;
-  white-space: nowrap;
-  flex-direction: row-reverse;
-}
-
-.demo-date-picker .block:last-child {
-  border-right: none;
+  flex-direction: column-reverse;
 }
 
 .block {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-  overflow: hidden;
+  margin-top: 10px;
 }
 
 .demo-date-picker .demonstration {