Merge branch 'master' of gitea.intra.yunpaper.com:zhangqi/kuailelunwen_new_houtai into styleCommon-1218

src/views/super/Ranking/RankBatchList.vue

@@ -29,7 +29,6 @@
                     <el-table-column fixed="left"
                         v-if="(dataRank == 1 || dataRank == 2) && (dataType == 'ver_type' || dataType == 'check_type')"
                         prop="name" :key="selectedType" :label="type_select[selectedType]" min-width="120">
-
                         <template slot="header">
                             <el-select class="custom-select tableHeaderSelect" popper-class="custom-select-dropdown"
                                 v-model="selectedType" @change="changeRankType">
@@ -50,13 +49,11 @@
                         :prop="String(index + 1)"
                         :render-header=" (h, scope) => index == 3 ? renderHeaderWithIcon(h, scope, require('@/assets/require.svg')) : scope.column.label"
                         sortable="custom" min-width="170">
-
                         <!--产品利润排行展示查看更多-->
                         <template v-if="index == 3 && dataRank == 1" scope="{ row, $index }">
                                 <el-popover v-model="row.id_popover" :ref="`popover-${row.id}`"
                                 placement="bottom" trigger="manual" :append-to-body="false"  :visible-arrow="true"
                                 popper-class="custom-popover"  @show="popshow" >
-
                                 <div v-if="type != 'agent'" class="pop-wrap">
                                     <div class="flex-between flex pop-top">
                                         <h3>
@@ -69,7 +66,6 @@
                                     </div>
                                     <el-table :data="tableData1" style="width: 100%">
                                         <el-table-column prop="value_1" width="200" label="日期"></el-table-column>
-
                                         <el-table-column width="200" :label="rank_type_desc[dataRank]">
                                             <template slot-scope="scope">
                                                 <div class="flex">
@@ -91,7 +87,6 @@
                                     </div>
                                     <el-table :data="tableData1" style="width: 100%">
                                         <el-table-column prop="sort" width="95" label="排序">
-
                                         </el-table-column>
                                         <el-table-column prop="name" width="250" label="服务名称"></el-table-column>
                                         <el-table-column prop="rate" width="130" label="毛利占比">
@@ -111,7 +106,6 @@
                                         <el-table-column prop="value_2" width="130" label="订单数"></el-table-column>
                                     </el-table>
                                 </div>
-
                                 <div class="flex" slot="reference">
                                     <!-- {{ row[field] }} -->
                                     {{ $formatNumber(row[field]) }}
@@ -120,7 +114,6 @@
                                             :hoverColor="'#006AFF'" @click="handleClick(row, $index, 'id')" />
                                 </div>
                             </el-popover>
-
                         </template>
                         <template v-else slot-scope="scope">
                             <div class="flex">
@@ -128,7 +121,6 @@
                             </div>
                         </template>
                     </el-table-column>
-
                     <!--产品利润排行展示代理商排行-->
                     <el-table-column v-if="dataRank == 1 && (dataType == 'ver_type' || dataType == 'check_type')"
                         :render-header=" (h, scope) => renderHeaderWithIcon(h, scope, require('@/assets/require.svg')) "
@@ -184,7 +176,10 @@ import CustomDropdown from '@/components/CustomDropdown.vue';
 import SvgIcon from '@/components/SvgIcon.vue';
 import GuipToolTip from '@/components/GuipToolTip.vue';
 import {getDate,getFormattedDate} from "@/utils/common.js"
+<<<<<<< HEAD
 
+=======
+>>>>>>> b3837ab9b64a6bcf6f0c21885dbbe52d14501704
 // import HoverImage from '@/components/super/HoverImage.vue';
 export default {
     name: 'rank_batch_list',
@@ -271,8 +266,6 @@ export default {
             this.text = this.getNowDate()
             this.dataType = this.type
             this.dataRank = this.rank_type
-
-
             this.getRankingData();
         },
         handleUpdateView(newView) {
@@ -290,9 +283,7 @@ export default {
             this.textDesc = viewdesc + this.text;
             this.selectedDate = date;
             localStorage.setItem('date', JSON.stringify(date))
-
             this.$refs.dropdownRef.closeDropdown();
-
             this.currentPage = 1;
             this.getRankingData()
         },
@@ -355,7 +346,6 @@ export default {
             });
             // 打开当前行的弹框
             row[type + '_popover'] = true;
-
             let obj = {}
             if (this.dataType == 'agent') {
                 obj.aid = row.id
@@ -385,7 +375,6 @@ export default {
             });
             // 打开当前行的弹框
             row[type + '_popover_2'] = true;
-
             let obj = {}
             if (this.dataType == 'agent') {
                 obj.aid = row.id
@@ -403,7 +392,6 @@ export default {
             ariaEls.forEach((item) => {
                 item.removeAttribute('aria-hidden')
             })
-
             ariaEls = document.querySelectorAll('.el-radio__original')
             ariaEls.forEach((item) => {
                 item.removeAttribute('aria-hidden')
@@ -453,10 +441,8 @@ export default {
             const date = new Date(this.text);
             const year = date.getFullYear();
             const month = date.getMonth() + 1;
-
             const currentYear = new Date().getFullYear();
             const currentMonth = new Date().getMonth() + 1;
-
             this.current_month = '';
             if (this.view === 'month' && year == currentYear && month == currentMonth) {
                 this.current_month = '(当月)';
@@ -472,7 +458,6 @@ export default {
                 for (let i = 3; i >= 0; i--) {
                     let m = month - i;
                     if (m <= 0) m += 12;
-
                     monthLabels.push(m + '月' + this.rank_type_desc[this.rank_type]);
                 }
                 this.labels = monthLabels;