From 2fddf66a5d752b3f2b77bcd5cae71abeef00292b Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Mon, 11 Nov 2024 22:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=B5=81=E6=B0=B4-=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0-listByPage=E6=94=B9list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/room/RoomSerialView.vue | 104 ++++++++++++++++++------------
 1 file changed, 61 insertions(+), 43 deletions(-)

diff --git a/src/views/room/RoomSerialView.vue b/src/views/room/RoomSerialView.vue
index b1b09ef..6e71841 100644
--- a/src/views/room/RoomSerialView.vue
+++ b/src/views/room/RoomSerialView.vue
@@ -10,15 +10,30 @@
         <div class="big-tips">
           数据量过大，不再默认加载所有的数据，请先选择时间后，再点查询按钮
         </div>
-        <form id="searchForm" action="/admin/roomSerial/export" method="POST">
+        <form id="searchForm"
+              action="/admin/roomSerial/export"
+              method="POST">
           房主平台号(多个查询以英文逗号分隔):
-          <input type="text" name="erbanNos" id="erbanNos" class="input-sm"  style="margin-right: 40px;display: inline-block;"/> 选择时间:
-          <input type="text" name="startTime" id="startTime" class="input-sm" /> 至
-          <input type="text" id="endTime" name="endTime" class="input-sm" />
+          <input type="text"
+                 name="erbanNos"
+                 id="erbanNos"
+                 class="input-sm"
+                 style="margin-right: 40px;display: inline-block;" /> 选择时间:
+          <input type="text"
+                 name="startTime"
+                 id="startTime"
+                 class="input-sm" /> 至
+          <input type="text"
+                 id="endTime"
+                 name="endTime"
+                 class="input-sm" />
           <br />
           <div style="width: 60%">
             房间类型:
-            <select name="isPermit" id="isPermit" class="input-sm" style="width: 30%;display: inline-block;">
+            <select name="isPermit"
+                    id="isPermit"
+                    class="input-sm"
+                    style="width: 30%;display: inline-block;">
               <option value="0">全部</option>
               <option value="1">牌照房</option>
               <option value="3">新秀房</option>
@@ -29,10 +44,12 @@
         </form>
       </div>
       <div class="col-sm-8">
-        <button id="room-serial-refresh" class="btn btn-default">
+        <button id="room-serial-refresh"
+                class="btn btn-default">
           <i class="glyphicon glyphicon-wrench"></i>查询
         </button>
-        <button id="room-serial-export" class="btn btn-default">
+        <button id="room-serial-export"
+                class="btn btn-default">
           <i class="glyphicon glyphicon-plus"></i>导出
         </button>
       </div>
@@ -40,37 +57,40 @@
   </section>
   <!-- .content -->
 
-  <div
-    class="modal fade"
-    id="tipModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabel"
-  >
-    <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="tipModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
           <h4 class="modal-title">提示信息</h4>
         </div>
-        <div class="modal-body" id="tipMsg"></div>
+        <div class="modal-body"
+             id="tipMsg"></div>
       </div>
     </div>
   </div>
 
-  <div
-    class="modal fade"
-    id="roomGiftSerialDetailModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabel"
-  >
-    <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="roomGiftSerialDetailModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
-          <h4 class="modal-title" id="roomGiftSerialDetailModalTitle">房间明细</h4>
+          <h4 class="modal-title"
+              id="roomGiftSerialDetailModalTitle">房间明细</h4>
         </div>
         <div class="modal-body">
           <div class="summary col-sm-12">
@@ -95,7 +115,9 @@
         </div>
         <div class="modal-footer">
           <h4 id="roundDetailModalFooter"></h4>
-          <button type="button" class="btn btn-default" data-dismiss="modal">确定</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">确定</button>
         </div>
       </div>
     </div>
@@ -109,16 +131,16 @@ import { serverError } from "@/utils/maintainer";
 
 export default {
   name: "RoomSerialView",
-  setup() {
+  setup () {
     return {};
   },
-  created() {
+  created () {
     this.$nextTick(function () {
       this.initData();
     });
   },
   methods: {
-    initData() {
+    initData () {
       // ComboboxHelper.build(null, '#isPermit');
       $(function () {
         $("#table").bootstrapTable("destroy");
@@ -140,11 +162,10 @@ export default {
               align: "center",
               width: "10%",
             },
-            { field: "totalRadish", title: "萝卜流水", align: "center", width: "10%" },
+            // { field: "totalRadish", title: "萝卜流水", align: "center", width: "10%" },
             { field: "roomTitle", title: "房间标题", align: "center", width: "10%" },
             { field: "clanName", title: "公会名称", align: "center", width: "10%" },
             { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
-            { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
             {
               field: "id",
               title: "操作",
@@ -169,15 +190,11 @@ export default {
           cache: false,
           striped: true,
           showRefresh: false,
-          pageSize: 10,
-          pagination: true,
-          pageList: [1, 10, 20, 30, 50],
+          pagination: false,
           search: false,
-          sidePagination: "server", //表示服务端请求
-          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
           //设置为limit可以获取limit, offset, search, sort, order
           queryParamsType: "undefined",
-          queryParams: function queryParams(params) {
+          queryParams: function queryParams (params) {
             //设置查询参数
             var param = {
               pageNumber: params.pageNumber,
@@ -200,6 +217,7 @@ export default {
           onLoadError: function () {
             //加载失败时执行
             console.log("load fail");
+            enableRefreshBtn();
           },
         });
 
@@ -219,7 +237,7 @@ export default {
 
         $("#room-serial-refresh").click(function () {
           disableRefreshBtn();
-          $("#table").bootstrapTable("refresh", { url: "/admin/roomSerial/listByPage" });
+          $("#table").bootstrapTable("refresh", { url: "/admin/roomSerial/list" });
         });
 
         $("#room-serial-export").click(function () {
@@ -235,11 +253,11 @@ export default {
           }
         });
 
-        function disableRefreshBtn() {
+        function disableRefreshBtn () {
           $("#room-serial-refresh").attr("disabled", "true");
         }
 
-        function enableRefreshBtn() {
+        function enableRefreshBtn () {
           $("#room-serial-refresh").removeAttr("disabled");
         }
 
@@ -282,7 +300,7 @@ export default {
             search: false,
             sidePagination: "server", //表示服务端请求
             queryParamsType: "undefined",
-            queryParams: function queryParams(params) {
+            queryParams: function queryParams (params) {
               //设置查询参数
               var param = {
                 page: params.pageNumber,
@@ -330,7 +348,7 @@ export default {
           });
         });
 
-        function apiResult(json) {
+        function apiResult (json) {
           if (json.code == 200 && json.message == "success") {
             return true;
           }