Merge branch 'xinyan' into test

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

@@ -2,6 +2,7 @@
 import { onMounted, ref, watch } from 'vue';
 import { getOperationSelect, getTasks, getTasksId } from '/@/views/reportManage/TaskManage/api';
 
+
 const props = defineProps({
   showOperationSearch: {
     type: Boolean,
@@ -130,7 +131,7 @@ const selectCommonGroup1 = () => {
 
 // 快捷选择欧洲+英国国家
 const selectCommonGroup2 = () => {
-  countryList.value = ['比利时', '德国', '法国', '荷兰', '西班牙', '意大利', '英国'];
+  countryList.value = ['比利时', '德国', '法国', '荷兰', '西班牙', '意大利', '英国', '波兰'];
   emitChange(); // 更新选择后的数据
 };
 
@@ -153,14 +154,15 @@ defineExpose({ fetchFilteredData, filteredData, updateData });
               @change="emitChange"></el-input>
     <el-input v-model="platformNameList" class="flex-item" clearable placeholder="平台名称" style="width: 130px"
               @change="emitChange"></el-input>
-    <el-input v-model="operationList" class="flex-item" clearable placeholder="运营" style="width: 130px" @change="emitChange"></el-input>
+    <el-input v-model="operationList" class="flex-item" clearable placeholder="运营" style="width: 130px"
+              @change="emitChange"></el-input>
     <el-select
         v-model="usersList"
         class="flex-item"
-        multiple
-        filterable
         clearable
         collapse-tags
+        filterable
+        multiple
         placeholder="填写人"
         style="width: 175px;"
     >
@@ -171,19 +173,22 @@ 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: 160px;">
+    <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>
-        <el-button text size="small" @click="selectCommonGroup2">欧洲+英国</el-button>
+        <el-button size="small" text @click="selectCommonGroup1">美洲区</el-button>
+        <el-button size="small" text @click="selectCommonGroup2">欧洲+英国</el-button>
       </template>
     </el-select>
-    <el-select v-model="brandNameList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple style="width: 145px;"
-               placeholder="品牌">
+    <el-select v-model="brandNameList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple
+               placeholder="品牌"
+               style="width: 145px;">
       <el-option v-for="item in brandNameOptions" :key="item" :label="item" :value="item" />
     </el-select>
-    <el-select v-model="platformList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple style="width: 145px;"
-               placeholder="平台">
+    <el-select v-model="platformList" class="flex-item" clearable collapse-tags collapse-tags-tooltip multiple
+               placeholder="平台"
+               style="width: 145px;">
       <el-option v-for="item in platformOptions" :key="item" :label="item" :value="item" />
     </el-select>
   </div>