各页面筛选条件优化

src/views/main/outBagModule/appAdmin.vue

@@ -164,12 +164,6 @@ const settingData = () => {
         type: "input",
         needEnterEvent: true
       },
-      {
-        label: "广告平台",
-        prop: "channelName",
-        type: "select",
-        options: []
-      },
       {
         label: "应用类型",
         prop: "appType",

src/views/main/userModule/relieveLogsList.vue

@@ -9,6 +9,7 @@
         @selection-change="handleSelectionChange">
         <el-table-column prop="appId" label="应用ID" width="150" />
         <el-table-column prop="appName" label="应用名称" width="150" />
+        <el-table-column prop="ditchName" label="渠道来源" width="150" />
         <el-table-column prop="nickName" label="用户昵称" width="90" />
         <el-table-column prop="userId" label="用户ID" width="160" />
         <el-table-column prop="userStatus" label="用户状态" width="90">
@@ -16,7 +17,6 @@
             {{ getDictionaryName('user_status',scope.row.userStatus) }}
           </template>
         </el-table-column>
-        <el-table-column prop="channelId" label="渠道商ID" width="90" />
         <el-table-column prop="platformId" label="平台ID" width="150" />
         <el-table-column prop="deblockingReason" label="解禁原因" width="200" />
         <el-table-column prop="deblockingTime" label="解禁时间" width="160">
@@ -95,8 +95,6 @@
 
   const formSearch = ref({
     appId: null,// 应用ID
-    channelId: null,// 渠道ID
-    channelType: null,//渠道类型
     channelOrigin: null,// 渠道来源
     deblockingReason: null,// 解封原因
     deblockingTimeBegin: null,// 解封时间开始
@@ -133,18 +131,6 @@
           type: 'input',
           needEnterEvent: true
         },
-        {
-          label: '渠道ID',
-          prop: 'channelId',
-          type: 'input',
-          needEnterEvent: true
-        },
-        {
-          label: '渠道类型',
-          prop: 'channelType',
-          type: 'select',
-          options: getOptions('channel_type')
-        },
         {
           label: '渠道来源',
           prop: 'channelOrigin',
@@ -157,12 +143,6 @@
           type: 'input',
           needEnterEvent: true
         },
-        {
-          label: '操作人',
-          prop: 'operator',
-          type: 'input',
-          needEnterEvent: true
-        },
         { label: '解封时间', prop: 'deblockingTime', type: 'daterange' },
         { label: '登录时间', prop: 'loginTime', type: 'daterange' },
       ]
@@ -185,7 +165,6 @@
 
   // 搜索
   const handleFormSubmitted = (formData) => {
-    // console.log("接收到子组件传递的数据", formData);
     formSearch.value.page = 1;
     formSearch.value.limit = 20;
     formSearch.value.appId = formData.appId;
@@ -199,12 +178,18 @@
     if (formData.deblockingTime) {
       formSearch.value.deblockingTimeBegin = formData.deblockingTime[0];
       formSearch.value.deblockingTimeEnd = formData.deblockingTime[1];
+    }else{
+      formSearch.value.deblockingTimeBegin = null
+      formSearch.value.deblockingTimeEnd = null
     }
 
     // 登录时间
     if (formData.loginTime) {
       formSearch.value.loginTimeBegin = formData.loginTime[0];
       formSearch.value.loginTimeEnd = formData.loginTime[1];
+    }else {
+      formSearch.value.loginTimeBegin = null
+      formSearch.value.loginTimeEnd = null
     }
 
     getList();
@@ -214,8 +199,6 @@
   const handleFormReset = () => {
     formSearch.value = {
       appId: null,// 应用ID
-      channelId: null,// 渠道ID
-      channelType: null,//渠道类型
       channelOrigin: null,// 渠道来源
       deblockingReason: null,// 解封原因
       deblockingTimeBegin: null,// 解封时间开始

src/views/main/userModule/riskLogsList.vue

@@ -29,16 +29,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="channelId" label="渠道商ID" width="90" />
-<!--        <el-table-column prop="channelOrigin" label="渠道来源" width="90">-->
-<!--          <template #default="scope">-->
-<!--            {{ getDictionaryName('channel_origin',scope.row.channelOrigin) }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column prop="channelType" label="渠道类型" width="90">-->
-<!--          <template #default="scope">-->
-<!--            {{ getDictionaryName('channel_type',Number(scope.row.channelType)) }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
         <el-table-column prop="phoneModel" label="手机型号" width="90" />
         <el-table-column prop="platformId" label="平台ID" width="150" />
         <el-table-column prop="communicationOperator" label="IP运营商" width="100" />
@@ -57,18 +47,6 @@
             {{ convertUTCToBeijing(scope.row.registryTime) }}
           </template>
         </el-table-column>
-
-
-        <!-- <el-table-column label="操作" width="150" fixed="right">
-          <template #default="scope">
-            <div class="button">
-              <el-button class="button-item" type="primary" style="margin-bottom: 5px;"
-                @click="editUserType(scope.row)">
-                解封用户
-              </el-button>
-            </div>
-          </template>
-        </el-table-column> -->
       </Table>
     </div>
 
@@ -110,6 +88,7 @@
   });
 
   const formSearch = ref({
+    userId: null,//用户ID
     appId: null,// 应用ID
     bannedReason: null, //封禁原因
     bannedTimeBegin: null, //封禁开始时间
@@ -152,24 +131,12 @@
           type: 'input',
           needEnterEvent: true
         },
-        {
-          label: '渠道商ID',
-          prop: 'channelId',
-          type: 'input',
-          needEnterEvent: true
-        },
         {
           label: '渠道来源',
           prop: 'channelOrigin',
           type: 'select',
           options: getOptions('channel_origin'),
         },
-        {
-          label: '渠道类型',
-          prop: 'channelType',
-          type: 'select',
-          options: getOptions('channel_type')
-        },
         { label: '封禁时间', prop: 'bannedTime', type: 'daterange' },
       ]
     })
@@ -197,6 +164,7 @@
     formSearch.value.limit = 20;
 
     formSearch.value.appId = formData.appId;
+    formSearch.value.userId = formData.userId;
     formSearch.value.bannedReason = formData.bannedReason;
 
     formSearch.value.channelId = formData.channelId;
@@ -207,6 +175,9 @@
     if (formData.bannedTime) {
       formSearch.value.bannedTimeBegin = formData.bannedTime[0];
       formSearch.value.bannedTimeEnd = formData.bannedTime[1];
+    }else {
+      formSearch.value.bannedTimeBegin = null
+      formSearch.value.bannedTimeEnd = null
     }
 
 
@@ -216,6 +187,7 @@
   // 表单重置
   const handleFormReset = () => {
     formSearch.value = {
+      userId: null,//用户ID
       appId: null,// 应用ID
       bannedReason: null, //封禁原因
       bannedTimeBegin: null, //封禁开始时间

src/views/main/userModule/userList.vue

@@ -22,7 +22,12 @@
 <!--        <el-table-column prop="userType" label="用户类型" width="90" />-->
         <el-table-column prop="appId" label="应用ID" width="150" />
         <el-table-column prop="appName" label="应用名称" width="150" />
-        <el-table-column prop="appType" label="应用类型" width="90" />
+        <el-table-column prop="appType" label="应用类型" width="90">
+          <template #default="scope">
+            {{ getDictionaryName('app_type',scope.row.appType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="ditchName" label="渠道来源" width="150" />
         <el-table-column prop="communicationOperator" label="通信运营商" width="100" />
         <el-table-column prop="deviceRepeatCount" label="设备重复数量" width="110" />
         <el-table-column prop="ipRepeatCount" label="IP重复数量" width="100" />
@@ -138,17 +143,15 @@
   import From from "@/components/from/index.vue";
   import Table from "@/components/table/index.vue";
   import Layer from '@/components/layer/index.vue'
-  import Card from './components/card/index.vue'
   import { ElMessage } from 'element-plus'
-  import { getUserList, getStaticList, riskBannedUser, riskLockUser, appUserEcpm } from '@/api/userModule.js'
+  import { getUserList, riskBannedUser, riskLockUser, appUserEcpm } from '@/api/userModule.js'
   import { riskChangeUserStatus } from '@/api/riskModule.js'
   import { convertUTCToBeijing } from '@/utils/index.js'
   import { useGetDictList } from '@/hooks/useGetDictList.js'
   import { useStore } from 'vuex'
 
   const store = useStore()
-  const { dictData, loadDictData, getOptions, getDictionaryName } = useGetDictList();
-  const form = ref(null);
+  const { loadDictData, getOptions, getDictionaryName } = useGetDictList();
   const tableData = ref([]);
 
   // 分页参数, 供table使用
@@ -159,15 +162,16 @@
   });
 
   const formSearch = ref({
-    channelOrigin: undefined,// 渠道来源
+    ditchId: undefined,// 渠道来源
     channelType: undefined,// 渠道类型
     lastLoginTime: undefined,// 最新登录时间
     limit: 20,// 当前页数量(查询量)
     nickName: undefined,// 用户昵称
     userId: undefined,// 用户ID
     page: 1,// 当前页码
-    registryTime: undefined,// 注册时间
-    userType: undefined,// 用户类型
+    registryTimeBegin: undefined,// 注册时间
+    registryTimeEnd: undefined,// 注册时间
+    userStatus: undefined,// 用户类型
   });
 
   const dynamicFormItems = ref([])
@@ -194,26 +198,20 @@
           type: 'input',
           needEnterEvent: true
         },
-        /* {
-          label: '渠道类型',
-          prop: 'channelType',
-          type: 'select',
-          options: getOptions('channel_type')
-        }, */
         {
           label: '渠道来源',
-          prop: 'channelOrigin',
+          prop: 'ditchId',
           type: 'select',
           options: getOptions('channel_origin'),
         },
         {
-          label: '用户类型',
-          prop: 'userType',
+          label: '用户状态',
+          prop: 'userStatus',
           type: 'select',
           options: getOptions('user_status'),
         },
-        { label: '登录时间', prop: 'lastLoginTime', type: 'date' },
-        { label: '注册时间', prop: 'registryTime', type: 'date' },
+        { label: '注册时间开始', prop: 'registryTimeBegin', type: 'date' },
+        { label: '注册时间结束', prop: 'registryTimeEnd', type: 'date' },
       ]
 
       // 查看ECPM
@@ -252,11 +250,10 @@
     formSearch.value.limit = 20;
     formSearch.value.nickName = formData.nickName;
     formSearch.value.userId = formData.userId;
-    formSearch.value.channelOrigin = formData.channelOrigin;
-    formSearch.value.channelType = formData.channelType;
-    formSearch.value.userType = formData.userType;
-    formSearch.value.lastLoginTime = formData.lastLoginTime || null
-    formSearch.value.registryTime = formData.registryTime || null
+    formSearch.value.ditchId = formData.ditchId;
+    formSearch.value.userStatus = formData.userStatus;
+    formSearch.value.registryTimeBegin = formData.registryTimeBegin || null
+    formSearch.value.registryTimeEnd = formData.registryTimeEnd || null
 
     getList();
   };
@@ -264,7 +261,7 @@
   // 表单重置
   const handleFormReset = () => {
     formSearch.value = {
-      channelOrigin: undefined,// 渠道来源
+      ditchId: undefined,// 渠道来源
       channelType: undefined,// 渠道类型
       lastLoginTime: undefined,// 最新登录时间
       limit: 20,// 当前页数量(查询量)