Forráskód Böngészése

fix(广告列表页面、数据总览页面): 修复接口错误;修复查询参数错误;补充筛选字段功能;

广告列表页面:
    -修复查询参数设置为字符串数组的错误;
    -修复接口错误
    -补充筛选字段及刷新表格功能

数据总览页面:
    -补充筛选字段及刷新表格功能
fxs 6 hónapja
szülő
commit
b9ca07b3ce

+ 1 - 0
index.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" href="/logoTest.svg" />
+    <!-- <link rel="icon" href="/logo.svg"/> -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <!-- <title>淳皓游戏管理平台</title> -->
     <title>测试库-游戏管理平台</title>

+ 1 - 3
src/components/table/CustomTable.vue

@@ -48,9 +48,7 @@ const filterFormCheckAllInfo = ref<Record<string, SelectAllItem>>({})
 const customFilterRef = ref<CustomFilterRef>()
 
 const { analysisResCode } = useRequest()
-/**
- *  自定义筛选重置有问题!!!!!!!!!!!!!!!
- *  */
+
 const {
   customFilterDialog,
   customFilterInfo,

+ 6 - 1
src/types/table.ts

@@ -79,9 +79,14 @@ export interface PropsParams {
   needRowindex?: boolean // 是否需要行号
   needAverage?: boolean // 是否需要均值功能
   needLeftTools?: boolean // 是否需要左侧的工具栏
+  /**
+   *  是否需要右侧工具栏
+   * 如果需要筛选字段,请把tableFieldsInfo设置为响应式对象
+   */
+  needRightTools?: boolean
   needUpload?: boolean // 是否需要上传功能
   needDownload?: boolean // 是否需要下载功能
-  needRightTools?: boolean // 是否需要右侧工具栏
+
   openFilterQuery?: boolean // 是否开启上方查询功能
   openPageQuery?: boolean // 是否开启分页功能
   openRemoteQuery?: boolean // 是否开启远程查询

+ 1 - 0
src/views/AppManage/UserConversionTable.vue

@@ -161,6 +161,7 @@ const goDetail = (data: any) => {
       :open-filter-query="true"
       :need-left-tools="true"
       :open-remote-query="true"
+      :need-right-tools="true"
       @add-new-item="goDetail"
     >
       <template #tableOperation>

+ 37 - 35
src/views/Home/AdvertisingData/AdvertisingList.vue

@@ -10,6 +10,7 @@ import { createDateRange, resetTimeToMidnight } from '@/utils/common'
 import { useAnalysis } from '@/hooks/useAnalysis'
 import { usePage } from '@/hooks/usePage'
 import { FilterType, type QueryInfo, type SelectInfo, type TableFieldInfo } from '@/types/table'
+import { FieldSpecialEffectType, TextType } from '@/types/tableText'
 
 const { selectInfo } = useCommonStore()
 const { AllApi } = useRequest()
@@ -19,13 +20,13 @@ const { watchPageChange } = usePage()
 
 // 表格请求配置
 const requestConfig = reactive<ReqConfig>({
-  url: AllApi.userActionList,
+  url: `http://service.ichunhao.cn${AllApi.userAdsDetail}`,
   otherOptions: {
     pf: selectInfo.pf,
     gid: selectInfo.gid,
     startTime: createDateRange(7)[0],
     endTime: createDateRange(7)[1],
-    adsState: ['0', '1', '2'] // 默认选所有
+    adsState: [0, 1, 2] // 默认选所有
   }
 })
 
@@ -36,24 +37,40 @@ const paginationConfig = reactive({
   pageSizeList: [15, 30] // 页数大小列表
 })
 
-const tableFieldsInfo: Array<TableFieldInfo> = [
+const tableFieldsInfo = reactive<Array<TableFieldInfo>>([
   {
-    name: 'id',
-    cnName: '主键',
-    isShow: false,
+    name: 'adsScene',
+    cnName: '广告场景',
+    isShow: true,
     needSort: false
   },
   {
-    name: 'pf',
-    cnName: '平台',
+    name: 'adsType',
+    cnName: '广告类型',
     isShow: true,
     needSort: false
   },
   {
-    name: 'gid',
-    cnName: '游戏ID',
+    name: 'adsState',
+    cnName: '广告状态',
     isShow: true,
-    needSort: false
+    needSort: false,
+    specialEffect: {
+      type: FieldSpecialEffectType.TEXT,
+      otherInfo: {
+        translateMap: {
+          0: '未播放',
+          1: '未看完',
+          2: '已看完'
+        },
+        color: {
+          0: '#909399',
+          1: '#E6A23C',
+          2: '#67C23A'
+        },
+        textType: TextType.TEXT
+      }
+    }
   },
   {
     name: 'userId',
@@ -85,47 +102,30 @@ const tableFieldsInfo: Array<TableFieldInfo> = [
     isShow: false,
     needSort: false
   },
-  {
-    name: 'adsType',
-    cnName: '广告类型',
-    isShow: true,
-    needSort: false
-  },
-  {
-    name: 'adsScene',
-    cnName: '广告场景',
-    isShow: true,
-    needSort: false
-  },
-  {
-    name: 'adsState',
-    cnName: '广告状态',
-    isShow: true,
-    needSort: false
-  },
+
   {
     name: 'openId',
     cnName: '用户openID',
     isShow: false,
     needSort: false
   }
-]
+])
 
 const adStateOptions: Array<SelectInfo> = [
   {
     name: 'unPlay',
     cnName: '未播放',
-    value: '0'
+    value: 0
   },
   {
     name: 'unFinished',
     cnName: '未看完',
-    value: '1'
+    value: 1
   },
   {
     name: 'finished',
     cnName: '已看完',
-    value: '2'
+    value: 2
   }
 ]
 
@@ -137,7 +137,7 @@ const queryInfo = reactive<Array<QueryInfo>>([
     type: FilterType.MULTI_SELECT,
     placeholder: '请选择广告状态',
     otherOption: adStateOptions,
-    default: ['0', '1', '2'],
+    default: [0, 1, 2],
     supplementInfo: '此项全选与全不选均为查找所有'
   },
   {
@@ -159,7 +159,8 @@ const queryInfo = reactive<Array<QueryInfo>>([
 ])
 
 const headerCardInfo: HeaderCardProps = {
-  title: '广告数据',
+  //   title: '广告数据',
+  title: '广告数据(正式服数据)',
   openDateSelect: true
 }
 
@@ -204,6 +205,7 @@ watchPageChange(() => [selectInfo.pf, selectInfo.gid], backupSelect, updateSelec
         :request-config="requestConfig"
         :query-info="queryInfo"
         :open-filter-query="true"
+        :need-right-tools="true"
       ></CustomTable>
     </div>
   </div>

+ 2 - 0
src/views/Home/AdvertisingData/AdvertisingOverview.vue

@@ -103,6 +103,7 @@ watchPageChange(() => [selectInfo.pf, selectInfo.gid], backupSelect, updateSelec
         :title="'广告数据总览(正式服数据)'"
         @change-date="changeDate"
       ></HeaderCard>
+      <!--      :title="'广告数据总览(正式服数据)'"-->
     </div>
     <div class="adOverviewStaticContainer">
       <StatisticText
@@ -126,6 +127,7 @@ watchPageChange(() => [selectInfo.pf, selectInfo.gid], backupSelect, updateSelec
           :request-config="dailyInfo.dataReqConfig"
           :title="'广告数据(正式服数据)'"
         ></TemporalTrend>
+        <!--        :title="'广告数据(正式服数据)'"-->
       </div>
     </div>
   </div>

+ 7 - 0
src/views/Home/Analysis/AdvertisingUsers.vue

@@ -157,6 +157,12 @@ const pagingConfig = reactive<TablePaginationSetting>({
 // 表格字段信息
 const tableFieldsInfo = reactive<Array<TableFieldInfo>>([
   {
+    name: 'userId',
+    cnName: '用户ID',
+    isShow: false,
+    needSort: false
+  },
+  {
     name: 'pid',
     cnName: '广告父级ID',
     isShow: true,
@@ -253,6 +259,7 @@ watchPageChange(() => [selectInfo.pf, selectInfo.gid], backupSelect, updateAllRe
         :open-remote-query="true"
         :open-page-query="true"
         :open-filter-query="true"
+        :need-right-tools="true"
       ></Table>
     </div>
   </div>

+ 16 - 0
src/views/Home/Analysis/UserBehavior.vue

@@ -252,6 +252,21 @@ const tableFieldsInfo = reactive<Array<TableFieldInfo>>([
         textType: TextType.TAG
       }
     }
+  },
+  {
+    name: 'remainData',
+    cnName: '留存数据',
+    isShow: false,
+    needSort: false,
+    specialEffect: {
+      type: FieldSpecialEffectType.CUSTOM,
+      otherInfo: {
+        render: (val: any) => {
+          if (!val) return '无'
+          return val
+        }
+      }
+    }
   }
 ])
 
@@ -290,6 +305,7 @@ watchPageChange(() => [selectInfo.pf, selectInfo.gid], backupSelect, updateAllRe
         :open-remote-query="true"
         :open-page-query="true"
         :open-filter-query="true"
+        :need-right-tools="true"
       ></Table>
     </div>
   </div>

+ 2 - 0
src/views/IndexView.vue

@@ -111,6 +111,7 @@ const changeNavBar = (val: string) => {
 
 // 资源的加载路径
 const resourceInfo: Record<string, string> = {
+  // logo: `/img/logo.svg`,
   logo: `/img/logoTest.svg`,
   defaultHead: `/img/default/defaultHead.png`
 }
@@ -244,6 +245,7 @@ onMounted(() => {
         <div class="logoBox">
           <el-image :fit="'fill'" class="logoImg" :src="blobUrlInfo.logo"></el-image>
           <span class="logoTitle">测试库</span>
+          <!-- <span class="logoTitle">淳皓科技</span> -->
         </div>
 
         <div class="gameSelect">