hbchen 6 сар өмнө
parent
commit
27c70371bd

+ 2 - 2
src/lang/modules/ReportManagement/SmartReport.js

@@ -79,7 +79,7 @@ export const SmartReportEn = {
     push: "Push",
     not_push: "Do not push",
   },
-  tooltip_pv_show: "The number of times the report has been opened, calculated once each time it is opened (only for authorized users)",
+  // tooltip_pv_show: "The number of times the report has been opened, calculated once each time it is opened (only for authorized users)",
   number_tooltip_pv_show: "Number of times the report has been opened, Counted each time it is opened",
   tooltip_uv_show: "The number of people accessing the report, and the same person accessing each report is only counted once (only authorized users are counted)",
   smart_msg: {
@@ -204,7 +204,7 @@ export const SmartReportZh = {
     push: "推送",
     not_push: "不推送",
   },
-  tooltip_pv_show: "报告被打开的次数,每次打开都计算一次(只统计有权限用户)",
+  // tooltip_pv_show: "报告被打开的次数,每次打开都计算一次(只统计有权限用户)",
   number_tooltip_pv_show: "报告被打开的次数,每次打开都计算一次",
   tooltip_uv_show: "访问报告的人数,每篇报告同一个人访问只计算一次(只统计有权限用户)",
   smart_msg: {

+ 16 - 6
src/views/report_manage/reportEn/reportlist.vue

@@ -152,8 +152,13 @@
 				>
           <template #header>
             <span v-if="item.key==='Pv'">
-              PV
-              <el-tooltip class="item" effect="dark" :content="`pv:${$t('ReportManage.number_tooltip_pv_show')}`" placement="top-start">
+              {{ item.label }}
+              <el-tooltip class="item" effect="dark" 
+              placement="top-start">
+                <div slot="content" style="width:420px;">
+                  <p style="padding:5px 0;">pv:{{$t('ReportManage.number_tooltip_pv_show')}}</p>
+                  <p style="padding:5px 0;">uv:{{$t('ReportManage.tooltip_uv_show')}}</p>
+                </div>
                 <i class="el-icon-warning"/>
               </el-tooltip>
             </span>
@@ -180,10 +185,13 @@
                 <span v-if="row.State == '6'">{{$t('ReportManage.smart_approved')}}</span>
               </span>
               <span v-else-if="item.key==='Stage'">第{{row.Stage}}期</span>
-              <span v-else-if="item.key==='Pv'" style="cursor:pointer; color:#4099ef;" >
-                <span @click="reportHandle(row,'PV')" v-if="row.PvEmail">{{row.PvEmail}}</span>
-                <span v-if="row.PvEmail&&row.Pv" style="color:#333">/</span>
-                <span v-if="row.Pv" style="color:#333">{{row.Pv}}</span>
+              <span v-else-if="item.key==='Pv'" >
+                <span @click="reportHandle(row,'PV')" 
+                :style="row.PvEmail?'cursor:pointer; color:#4099ef;':'color:#333'" >{{row.PvEmail||0}}</span>
+                <!-- <span v-if="row.PvEmail&&row.Pv" style="color:#333">/</span>
+                <span v-if="row.Pv" style="color:#333">{{row.Pv}}</span> -->
+                <span style="color:#333">/</span>
+                <span  style="color:#333">{{row.Uv||0}}</span>
               </span>
               <span v-else-if="item.key==='PublishTime'">
                 <template v-if="[1,2].includes(row.State)">
@@ -569,6 +577,7 @@ export default {
         {
             label: 'PV / UV',
             key: 'Pv',
+            widthsty: 140
         },
         {
             label:this.$t('Table.column_operations') || '操作',
@@ -866,6 +875,7 @@ export default {
         this.popData.customValue.splice(index,1)
     },
     showPVDetail(item){
+      if(!item.PvEmail) return 
       this.PVData.reportId=item.Id
       this.getPVDetail()
       this.PVData.show=true

+ 1 - 1
src/views/report_manage/reportlist.vue

@@ -756,7 +756,7 @@ export default {
               slot: "content",
               attrs: { style: "display:block;padding:5px 0;width:420px;" },
             },
-            `pv:${this.$t('ReportManage.tooltip_pv_show')}`
+            `pv:${this.$t('ReportManage.number_tooltip_pv_show')}`
           ),
           this.hasUV?h(
             "p",

+ 1 - 1
src/views/smartReport/reportList.vue

@@ -762,7 +762,7 @@ export default {
                     slot: "content",
                     attrs: { style: "display:block;padding:5px 0;width:420px;" },
                     },
-                    `pv:${this.$t('ReportManage.tooltip_pv_show')}`
+                    `pv:${this.$t('ReportManage.number_tooltip_pv_show')}`
                 ),
                 this.hasUV?h(
                     "p",