搜索

src/store/modules/app.js

@@ -3,7 +3,7 @@ let defaultSetting = {
   tag: true,
   menuCollapse: false,
   menuWidth: 230,
-  layout: 'classic',
+  layout: 'mixed',
   skin: 'mine',
   i18n: false,
   language: 'zh_CN',

src/views/system/user/index.vue

@@ -1,43 +1,25 @@
 <template>
   <div class="ma-content-block lg:flex justify-between">
     <div class="lg:w-2/12 pt-4 pl-2 pr-2">
-      <sa-tree-slider
-        :data="depts"
-        search-placeholder="搜索部门"
-        @click="switchDept"
-        v-model="defaultKey"
-      />
+      <sa-tree-slider :data="depts" search-placeholder="搜索部门" @click="switchDept" v-model="defaultKey" />
     </div>
 
     <div class="lg:w-10/12 w-full">
       <!-- CRUD 组件 -->
-      <sa-table
-        ref="crudRef"
-        :options="options"
-        :columns="columns"
-        :searchForm="searchForm"
-        @resetSearch="handleReset"
-      >
+      <sa-table ref="crudRef" :options="options" :columns="columns" :searchForm="searchForm" @resetSearch="handleReset">
         <!-- 搜索区 tableSearch -->
         <template #tableSearch>
           <a-col :sm="8" :xs="24">
             <a-form-item field="username" label="账号名称">
-              <a-input
-                v-model="searchForm.username"
-                placeholder="请输入账号名称"
-                allow-clear
-              />
+              <a-input v-model="searchForm.username" placeholder="请输入账号名称" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :sm="8" :xs="24">
             <a-form-item field="phone" label="手机">
-              <a-input
-                v-model="searchForm.phone"
-                placeholder="请输入手机"
-                allow-clear
-              />
+              <a-input v-model="searchForm.phone" placeholder="请输入手机" allow-clear />
             </a-form-item>
           </a-col>
+
           <!-- <a-col :sm="8" :xs="24">
             <a-form-item field="email" label="邮箱">
               <a-input
@@ -58,12 +40,7 @@
           </a-col> -->
           <a-col :sm="8" :xs="24">
             <a-form-item field="status" label="状态">
-              <sa-select
-                v-model="searchForm.status"
-                dict="data_status"
-                placeholder="请选择状态"
-                alow-clear
-              />
+              <sa-select v-model="searchForm.status" dict="data_status" placeholder="请选择状态" alow-clear />
             </a-form-item>
           </a-col>
         </template>
@@ -74,37 +51,23 @@
           <sa-switch
             v-model="record.status"
             :disabled="record.id == 1"
-            @change="changeStatus($event, record.id)"
-          ></sa-switch>
+            @change="changeStatus($event, record.id)"></sa-switch>
         </template>
         <!-- 头像列 -->
         <template #avatar="{ record }">
           <a-avatar>
-            <img
-              :src="
-                record.avatar
-                  ? $tool.showFile(record.avatar)
-                  : $url + 'avatar.jpg'
-              "
-              style="object-fit: cover"
-            />
+            <img :src="record.avatar ? $tool.showFile(record.avatar) : $url + 'avatar.jpg'" style="object-fit: cover" />
           </a-avatar>
         </template>
         <!-- 操作列 -->
         <template #operationCell="{ record }">
           <div v-if="record.id == 1">
-            <a-link @click="updateCache(record.id)"
-              ><icon-refresh /> 更新缓存</a-link
-            >
+            <a-link @click="updateCache(record.id)"><icon-refresh /> 更新缓存</a-link>
           </div>
         </template>
         <!-- 操作后置扩展 -->
         <template #operationAfterExtend="{ record }">
-          <a-dropdown
-            trigger="hover"
-            v-if="record.id != 1"
-            @select="selectOperation($event, record)"
-          >
+          <a-dropdown trigger="hover" v-if="record.id != 1" @select="selectOperation($event, record)">
             <a-link><icon-double-right /> 更多</a-link>
             <template #content>
               <!-- <a-doption value="updateCache" v-auth="['/core/user/clearCache']"
@@ -113,26 +76,12 @@
               <a-doption value="setHomePage" v-auth="['/core/user/setHomePage']"
                 >设置首页</a-doption
               > -->
-              <a-doption
-                value="setPermission"
-                v-auth="['/core/user/setPermission']"
-                >设置广告数据权限</a-doption
-              >
-              <a-doption
-                value="setGamePermission"
-                v-auth="['/core/user/setPermission']"
-                >设置游戏数据权限</a-doption
-              >
-              <a-doption
-                value="setNaturalPermission"
-                v-auth="['/core/user/setPermission']"
+              <a-doption value="setPermission" v-auth="['/core/user/setPermission']">设置广告数据权限</a-doption>
+
+              <a-doption value="setNaturalPermission" v-auth="['/core/user/setPermission']"
                 >设置自然量数据权限</a-doption
               >
-              <a-doption
-                value="resetPassword"
-                v-auth="['/core/user/initUserPassword']"
-                >重置密码</a-doption
-              >
+              <a-doption value="resetPassword" v-auth="['/core/user/initUserPassword']">重置密码</a-doption>
             </template>
           </a-dropdown>
         </template>
@@ -146,11 +95,7 @@
     <a-modal v-model:visible="setHomeVisible" @before-ok="saveHomePage">
       <template #title>设置用户后台首页</template>
       <a-form-item label="用户首页">
-        <sa-select
-          v-model="homePage"
-          placeholder="请选择用户首页"
-          dict="dashboard"
-        ></sa-select>
+        <sa-select v-model="homePage" placeholder="请选择用户首页" dict="dashboard"></sa-select>
       </a-form-item>
     </a-modal>
     <!-- 设置游戏数据权限 -->
@@ -161,141 +106,137 @@
 </template>
 
 <script setup>
-import { ref, onMounted, reactive, computed } from "vue";
-import api from "@/api/system/user";
-import commonApi from "@/api/common";
-import { Message, Modal } from "@arco-design/web-vue";
-import EditForm from "./edit.vue";
-import Permission from "./permission.vue";
-import GamePermission from "./game-permission.vue";
+import { ref, onMounted, reactive, computed } from 'vue'
+import api from '@/api/system/user'
+import commonApi from '@/api/common'
+import { Message, Modal } from '@arco-design/web-vue'
+import EditForm from './edit.vue'
+import Permission from './permission.vue'
+import GamePermission from './game-permission.vue'
 
-const depts = ref([{ label: "所有部门", value: 0 }]);
-const crudRef = ref();
-const editRef = ref();
-const permissionRef = ref();
-const gamePermissionRef = ref();
+const depts = ref([{ label: '所有部门', value: 0 }])
+const crudRef = ref()
+const editRef = ref()
+const permissionRef = ref()
+const gamePermissionRef = ref()
 
-const setHomeVisible = ref(false);
-const userid = ref();
-const homePage = ref("");
-const defaultKey = ref([0]);
+const setHomeVisible = ref(false)
+const userid = ref()
+const homePage = ref('')
+const defaultKey = ref([0])
 
 // 搜索表单
 const searchForm = ref({
-  username: "",
-  phone: "",
-  email: "",
-  status: "",
+  username: '',
+  phone: '',
+  email: '',
+  status: '',
   create_time: [],
-  dept_id: "",
-});
+  dept_id: '',
+})
 
 // SaTable 重置搜索
 const handleReset = async () => {
-  defaultKey.value = [0];
-  searchForm.value.dept_id = "";
-};
+  defaultKey.value = [0]
+  searchForm.value.dept_id = ''
+}
 
 // 部门切换
 const switchDept = (id) => {
-  searchForm.value.dept_id = id[0] === 0 ? "" : id[0];
-  crudRef.value.refresh();
-  defaultKey.value = id;
-};
+  searchForm.value.dept_id = id[0] === 0 ? '' : id[0]
+  crudRef.value.refresh()
+  defaultKey.value = id
+}
 
 // 修改状态
 const changeStatus = async (status, id) => {
-  const response = await api.changeStatus({ id, status });
+  const response = await api.changeStatus({ id, status })
   if (response.code === 200) {
-    Message.success(response.message);
-    crudRef.value.refresh();
+    Message.success(response.message)
+    crudRef.value.refresh()
   }
-};
+}
 
 // 更新缓存
 const updateCache = (id) => {
-  api
-    .clearCache({ id })
-    .then((res) => res.code === 200 && Message.success(res.message));
-};
+  api.clearCache({ id }).then((res) => res.code === 200 && Message.success(res.message))
+}
 
 // 重置密码
 const resetPassword = async (id) => {
-  api
-    .initUserPassword({ id })
-    .then((res) => res.code === 200 && Message.success(res.message));
-};
+  api.initUserPassword({ id }).then((res) => res.code === 200 && Message.success(res.message))
+}
 
 // 设置权限
 const setPermission = (record) => {
-  permissionRef.value.open(record);
-};
+  permissionRef.value.open(record)
+}
 
 // 设置游戏数据权限
 const setGamePermission = (record) => {
-  gamePermissionRef.value.open(record, "game");
-};
+  gamePermissionRef.value.open(record, 'game')
+}
 
 // 设置自然量数据权限
 const setNaturalPermission = (record) => {
-  gamePermissionRef.value.open(record, "natural");
-};
+  gamePermissionRef.value.open(record, 'natural')
+}
 
 // 设置首页
 const saveHomePage = async (done) => {
   const resp = await api.setHomePage({
     id: userid.value,
     dashboard: homePage.value,
-  });
+  })
   if (resp.code === 200) {
-    Message.success(resp.message);
-    crudRef.value.refresh();
-    done(true);
+    Message.success(resp.message)
+    crudRef.value.refresh()
+    done(true)
   }
-  done(false);
-};
+  done(false)
+}
 
 // 更多操作项
 const selectOperation = (value, record) => {
-  if (value === "resetPassword") {
+  if (value === 'resetPassword') {
     Modal.info({
-      title: "提示",
-      content: "确定将该用户密码重置为 sai123456 吗？",
+      title: '提示',
+      content: '确定将该用户密码重置为 sai123456 吗？',
       simple: false,
       onBeforeOk: (done) => {
-        resetPassword(record.id);
-        done(true);
+        resetPassword(record.id)
+        done(true)
       },
-    });
-    return;
+    })
+    return
   }
 
-  if (value === "updateCache") {
-    updateCache(record.id);
-    return;
+  if (value === 'updateCache') {
+    updateCache(record.id)
+    return
   }
 
-  if (value === "setHomePage") {
-    setHomeVisible.value = true;
-    userid.value = record.id;
-    return;
+  if (value === 'setHomePage') {
+    setHomeVisible.value = true
+    userid.value = record.id
+    return
   }
 
-  if (value === "setPermission") {
-    setPermission(record);
-    return;
+  if (value === 'setPermission') {
+    setPermission(record)
+    return
   }
 
-  if (value === "setGamePermission") {
-    setGamePermission(record);
-    return;
+  if (value === 'setGamePermission') {
+    setGamePermission(record)
+    return
   }
 
-  if (value === "setNaturalPermission") {
-    setNaturalPermission(record);
-    return;
+  if (value === 'setNaturalPermission') {
+    setNaturalPermission(record)
+    return
   }
-};
+}
 
 // SaTable 基础配置
 const options = reactive({
@@ -303,60 +244,62 @@ const options = reactive({
   operationColumnWidth: 210,
   add: {
     show: true,
-    auth: ["/core/user/save"],
+    auth: ['/core/user/save'],
     func: async () => {
-      editRef.value?.open();
+      editRef.value?.open()
     },
   },
   edit: {
     show: true,
-    auth: ["/core/user/update"],
+    auth: ['/core/user/update'],
     func: async (record) => {
-      editRef.value?.open("edit", record.id);
+      editRef.value?.open('edit', record.id)
     },
   },
   delete: {
     show: true,
-    auth: ["/core/user/destroy"],
+    auth: ['/core/user/destroy'],
     func: async (params) => {
-      const resp = await api.destroy(params);
+      const resp = await api.destroy(params)
       if (resp.code === 200) {
-        Message.success(`删除成功！`);
-        crudRef.value?.refresh();
+        Message.success(`删除成功！`)
+        crudRef.value?.refresh()
       }
     },
   },
-});
+})
 
 // SaTable 列配置
 const columns = reactive([
-  { title: "账户", dataIndex: "username", width: 130 },
-  { title: "昵称", dataIndex: "nickname", width: 120 },
-  { title: "手机", dataIndex: "phone", width: 150 },
+  { title: '部门', dataIndex: 'dept_name', width: 130 },
+  { title: '账户', dataIndex: 'username', width: 130 },
+  { title: '昵称', dataIndex: 'nickname', width: 120 },
+  { title: '角色', dataIndex: 'role_name', width: 120 },
+  { title: '手机', dataIndex: 'phone', width: 150 },
   // { title: "邮箱", dataIndex: "email", width: 200 },
-  { title: "状态", dataIndex: "status", width: 100 },
+  { title: '状态', dataIndex: 'status', width: 100 },
   // { title: "工作台", dataIndex: "dashboard", width: 100 },
-  { title: "注册时间", dataIndex: "create_time", width: 180 },
-]);
+  { title: '注册时间', dataIndex: 'create_time', width: 180 },
+])
 
 // 页面数据初始化
 const initPage = async () => {
-  const resp = await commonApi.commonGet("/core/dept/accessDept");
+  const resp = await commonApi.commonGet('/core/dept/accessDept')
   resp.data.map((item) => {
-    depts.value.push(item);
-  });
-};
+    depts.value.push(item)
+  })
+}
 
 // SaTable 数据刷新
 const refresh = async () => {
-  crudRef.value?.refresh();
-};
+  crudRef.value?.refresh()
+}
 
 // 页面加载完成执行
 onMounted(() => {
-  initPage();
-  refresh();
-});
+  initPage()
+  refresh()
+})
 </script>
 
 <style scoped></style>

src/views/v1/gameLog/regHour/index.vue

@@ -55,6 +55,10 @@ const options = reactive({
       action: 'totalRow',
       dataIndex: 'total',
     },
+    {
+      action: 'totalRow',
+      dataIndex: 'h0',
+    },
     {
       action: 'totalRow',
       dataIndex: 'h1',
@@ -161,6 +165,7 @@ const columns = reactive([
   { title: '游戏ID', dataIndex: 'game_id', width: 130, fixed: 'left' },
   { title: '游戏名', dataIndex: 'game_name', width: 120, fixed: 'left' },
   { title: '注册用户数', dataIndex: 'total', width: 140, fixed: 'left' },
+  { title: '0', dataIndex: 'h0', width: 80 },
   { title: '1', dataIndex: 'h1', width: 80 },
   { title: '2', dataIndex: 'h2', width: 80 },
   { title: '3', dataIndex: 'h3', width: 80 },

src/views/v1/gameLog/roleData/index.vue

@@ -91,7 +91,7 @@ const searchForm = ref({
   site_id: '',
   auth_id: '',
   user_name: '',
-  reg_time: '',
+  reg_time: dayjs().format('YYYY-MM-DD'),
 })
 
 // SaTable 基础配置
@@ -126,7 +126,6 @@ const getMediaOptions = async () => {
 // 页面数据初始化
 const initPage = async () => {
   await getMediaOptions()
-  searchForm.value.reg_time = dayjs().format('YYYY-MM-DD')
 }
 
 // SaTable 数据请求

src/views/v1/gameLog/sdkLoginLog/index.vue

@@ -108,7 +108,7 @@ const searchForm = ref({
   agent_id: '',
   site_id: '',
   auth_id: '',
-  login_time: '',
+  login_time: dayjs().format('YYYY-MM-DD'),
   reg_time: '',
 })
 

src/views/v1/gameLog/sdkOrderRank/index.vue

@@ -124,7 +124,7 @@ const searchForm = ref({
   server_id: '',
   server_name: '',
   reg_date: [],
-  pay_date: [],
+  pay_date: [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')],
 })
 
 // SaTable 基础配置
@@ -175,7 +175,6 @@ const getMediaOptions = async () => {
 // 页面数据初始化
 const initPage = async () => {
   await getMediaOptions()
-  searchForm.value.pay_date = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
 }
 
 // SaTable 数据请求

src/views/v1/gameLog/sdkOrderSuccess/index.vue

@@ -100,7 +100,7 @@ const searchForm = ref({
   server_id: '',
   server_name: '',
   reg_date: [],
-  pay_date: [],
+  pay_date: [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')],
 })
 
 // SaTable 基础配置
@@ -156,7 +156,6 @@ const getMediaOptions = async () => {
 // 页面数据初始化
 const initPage = async () => {
   await getMediaOptions()
-  searchForm.value.pay_date = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
 }
 
 // SaTable 数据请求

src/views/v1/gameLog/sdkRegLog/index.vue

@@ -56,10 +56,15 @@
               :allow-clear="false" />
           </a-form-item>
         </a-col>
-        <a-col :sm="8" :xs="24">
+        <!-- <a-col :sm="8" :xs="24">
           <a-form-item label="设备类型" field="vt">
             <sa-select v-model="searchForm.vt" dict="vt" placeholder="请选择设备类型" allow-clear />
           </a-form-item>
+        </a-col> -->
+        <a-col :sm="8" :xs="24">
+          <a-form-item label="负责人" field="auth_id">
+            <auth-select v-model="searchForm.auth_id" multiple />
+          </a-form-item>
         </a-col>
       </template>
 
@@ -82,6 +87,7 @@ import api from '../../api/gameLog/sdkRegLog'
 import dayjs from 'dayjs'
 import commonApi from '../../api/common'
 import GameSelect from '@/components/game-select/index.vue'
+import AuthSelect from '@/components/auth-select/index.vue'
 
 // 引用定义
 const crudRef = ref()
@@ -97,6 +103,7 @@ const searchForm = ref({
   site_id: '',
   reg_time: '',
   vt: '',
+  auth_id: [],
 })
 
 // SaTable 基础配置