ith5 5 月之前
父节点
当前提交
8db8f19421

+ 1 - 1
src/components/auth-select/index.vue

@@ -10,7 +10,7 @@
     allow-search
     allow-clear
     :filter-tree-node="filterTreeNode"
-    placeholder="请选择负责人" />
+    placeholder="负责人" />
 </template>
 <script setup>
 import { ref, onMounted, defineProps, defineEmits } from 'vue'

+ 1 - 1
src/components/game-select/index.vue

@@ -9,7 +9,7 @@
     :fieldNames="{ title: 'name', key: 'id' }"
     allow-search
     allow-clear
-    placeholder="请选择游戏" />
+    placeholder="游戏" />
 </template>
 
 <script setup>

+ 1 - 1
src/components/media-select/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-select :model-value="modelValue" @change="onUpdate" placeholder="请选择媒体类型" :multiple="multiple" allow-clear>
+  <a-select :model-value="modelValue" @change="onUpdate" placeholder="媒体类型" :multiple="multiple" allow-clear>
     <a-option
       :maxTagCount="1"
       v-for="item in mediaOptions"

+ 5 - 5
src/components/sa-table/index.vue

@@ -19,12 +19,12 @@
                   </template>
                   {{ options.searchText || '搜索' }}
                 </a-button>
-                <a-button @click="resetSearch">
+                <!-- <a-button @click="resetSearch">
                   <template #icon>
                     <icon-refresh />
                   </template>
                   {{ options.resetText || '重置' }}
-                </a-button>
+                </a-button> -->
               </a-space>
             </a-col>
           </a-row>
@@ -36,7 +36,7 @@
                 </a-row>
               </a-form>
             </a-col>
-            <a-divider v-if="!singleLine" style="height: 84px" direction="vertical" />
+            <a-divider v-if="!singleLine" style="min-height: 34px; height: 100%" direction="vertical" />
 
             <a-col :flex="singleLine ? '185px' : '80px'" :style="{ textAlign: 'right' }">
               <a-space :direction="!singleLine ? 'vertical' : 'horizontal'" :size="singleLine ? 10 : 20">
@@ -46,12 +46,12 @@
                   </template>
                   {{ options.searchText || '搜索' }}
                 </a-button>
-                <a-button @click="resetSearch">
+                <!-- <a-button @click="resetSearch">
                   <template #icon>
                     <icon-refresh />
                   </template>
                   {{ options.resetText || '重置' }}
-                </a-button>
+                </a-button> -->
               </a-space>
             </a-col>
           </a-row>

+ 8 - 8
src/views/v1/gameLog/active/index.vue

@@ -3,32 +3,32 @@
     <sa-table ref="crudRef" :options="options" :columns="columns" :searchForm="searchForm">
       <!-- 搜索区 tableSearch -->
       <template #tableSearch>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="6" :xxl="4" :xs="24">
           <a-form-item label="游戏" field="game_id">
             <game-select v-model="searchForm.game_id" multiple />
           </a-form-item>
         </a-col>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="8" :xxl="5" :xs="24">
           <a-form-item label="注册日期" field="tdate">
             <a-range-picker class="w-full" v-model="searchForm.tdate" :show-time="false" mode="date" />
           </a-form-item>
         </a-col>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="5" :xxl="4" :xs="24">
           <a-form-item label="媒体类型" field="media_id">
             <media-select v-model="searchForm.media_id" />
           </a-form-item>
         </a-col>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="5" :xxl="4" :xs="24">
           <a-form-item label="渠道ID" field="agent_id">
-            <a-input v-model="searchForm.agent_id" placeholder="请输入渠道ID" allow-clear />
+            <a-input v-model="searchForm.agent_id" placeholder="渠道ID" allow-clear />
           </a-form-item>
         </a-col>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="6" :xxl="4" :xs="24">
           <a-form-item label="广告位ID" field="site_id">
-            <a-input v-model="searchForm.site_id" placeholder="请输入广告位ID" allow-clear />
+            <a-input v-model="searchForm.site_id" placeholder="广告位ID" allow-clear />
           </a-form-item>
         </a-col>
-        <a-col :sm="6" :xs="24">
+        <a-col :sm="24" :md="7" :lg="8" :xl="6" :xxl="3" :xs="24">
           <a-form-item label="负责人" field="auth_id">
             <auth-select v-model="searchForm.auth_id" multiple />
           </a-form-item>

+ 7 - 8
src/views/v1/gameLog/hour/index.vue

@@ -10,14 +10,13 @@
         </a-col>
         <a-col :sm="24" :md="17" :lg="17" :xl="12" :xxl="8" :xs="24">
           <a-form-item label="注册日期" field="tdate">
-            <a-range-picker class="w-full" v-model="searchForm.tdate" :show-time="false" mode="date" />
-            <div>
-              <a-space>
-                <a-button size="mini" type="primary" @click="refreshDay('yesterday')">前一天</a-button>
-                <a-button size="mini" type="primary" @click="refreshDay('today')">当天</a-button>
-                <a-button size="mini" type="primary" @click="refreshDay('tomorrow')">后一天</a-button>
-              </a-space>
-            </div>
+            <a-space>
+              <a-range-picker class="w-full" v-model="searchForm.tdate" :show-time="false" mode="date" />
+
+              <a-button size="mini" type="primary" @click="refreshDay('yesterday')">前一天</a-button>
+              <a-button size="mini" type="primary" @click="refreshDay('today')">当天</a-button>
+              <a-button size="mini" type="primary" @click="refreshDay('tomorrow')">后一天</a-button>
+            </a-space>
           </a-form-item>
         </a-col>
         <a-col :sm="12" :md="6" :lg="7" :xl="6" :xxl="4" :xs="24">