vue2server 1.0.7 → 1.0.8

package/frontEnd/src/pages/MeetingListPage.vue

@@ -98,7 +98,7 @@
     <el-table
       ref="meetingTable"
       :key="tableKey"
-      :data="pagedRows"
+      :data="rows"
       border
       stripe
       size="small"
@@ -199,7 +199,7 @@
         layout="total, prev, pager, next"
         :current-page.sync="page"
         :page-size="pageSize"
-        :total="filteredRows.length"
+        :total="totalCount"
         @current-change="onPageChange"
       />
     </div>
@@ -223,8 +223,8 @@ export default {
         { key: "createDate", prop: "createTm", label: "创建日期", width: 160, align: "center", type: "createDate", sortable: "custom" },
         { key: "updateDate", prop: "updateTm", label: "最近编辑时间", width: 190, align: "center", type: "updateDate", sortable: "custom" }
       ],
-      // 示例数据：模拟接口返回的会议列表，用于本地展示
       rows: [],
+      totalCount: 0,
       // 查询条件
       filters: {
         belOrgNo: "",
@@ -276,53 +276,9 @@ export default {
       this.headerSortable = null;
     }
   },
-  computed: {
-    // 根据查询条件得到过滤后的数据列表
-    filteredRows() {
-      const subj = (this.filters.meetSubj || "").trim();
-      const belOrgNo = this.filters.belOrgNo || "";
-      const meetTypeCd = this.filters.meetTypeCd || "";
-      const [start, end] = Array.isArray(this.filters.createDateRange) ? this.filters.createDateRange : [];
-
-      const list = this.rows.filter(row => {
-        if (belOrgNo && row.belOrgNo !== belOrgNo) return false;
-        if (meetTypeCd && row.meetTypeCd !== meetTypeCd) return false;
-        if (subj && !row.meetSubj.includes(subj)) return false;
-        if (start && end) {
-          const d = row.createTm;
-          if (!d || d < start || d > end) return false;
-        }
-        return true;
-      });
-
-      if (this.sortField && this.sortOrder) {
-        const field = this.sortField;
-        const order = this.sortOrder === "ascending" ? 1 : -1;
-        list.sort((a, b) => {
-          const av = this.getTimeValue(a[field]);
-          const bv = this.getTimeValue(b[field]);
-          if (av === bv) return 0;
-          return av > bv ? order : -order;
-        });
-      }
-
-      return list;
-    },
-    // 当前页应显示的数据（在 filteredRows 基础上做前端分页）
-    pagedRows() {
-      const start = (this.page - 1) * this.pageSize;
-      return this.filteredRows.slice(start, start + this.pageSize);
-    }
-  },
-  watch: {
-    // 当过滤后的数据量变化时，自动纠正当前页，避免超出最大页码
-    filteredRows() {
-      const maxPage = Math.max(1, Math.ceil(this.filteredRows.length / this.pageSize) || 1);
-      if (this.page > maxPage) this.page = maxPage;
-    }
-  },
+  computed: {},
   methods: {
-    fetchData() {
+    async fetchData(allowRetry = true) {
       const params = {};
       const { belOrgNo, meetSubj, meetTypeCd, createDateRange } = this.filters;
       if (belOrgNo) params.belOrgNo = belOrgNo;
@@ -332,17 +288,32 @@ export default {
         params.startDate = createDateRange[0];
         params.endDate = createDateRange[1];
       }
-      get("/meeting/list", params)
-        .then(res => {
-          if (res && res.data) {
-            this.rows = res.data;
-          } else if (Array.isArray(res)) {
-            this.rows = res;
-          }
-        })
-        .catch(() => {
-          this.$message.error("获取会议列表失败");
-        });
+      params.page = this.page;
+      params.pageSize = this.pageSize;
+      if (this.sortField && this.sortOrder) {
+        params.sortField = this.sortField;
+        params.sortOrder = this.sortOrder;
+      }
+      try {
+        const res = await get("/meeting/list", params);
+        if (res && res.list) {
+          this.rows = Array.isArray(res.list) ? res.list : [];
+          this.totalCount = Number.isFinite(res.total) ? res.total : this.rows.length;
+        } else if (Array.isArray(res)) {
+          this.rows = res;
+          this.totalCount = res.length;
+        } else {
+          this.rows = [];
+          this.totalCount = 0;
+        }
+        const maxPage = Math.max(1, Math.ceil(this.totalCount / this.pageSize));
+        if (allowRetry && this.page > maxPage) {
+          this.page = maxPage;
+          await this.fetchData(false);
+        }
+      } catch (e) {
+        this.$message.error("获取会议列表失败");
+      }
     },
     /**
      * 初始化表头拖拽
@@ -394,6 +365,7 @@ export default {
       this.sortField = prop || "";
       this.sortOrder = order || "";
       this.page = 1;
+      this.fetchData();
     },
     // 点击“查询”：重置到第一页并重新请求接口
     onSearch() {
@@ -414,6 +386,7 @@ export default {
     // 分页器切换页码
     onPageChange(p) {
       this.page = p;
+      this.fetchData();
     },
     // 将会议类型编码转换为中文文案
     formatMeetType(code) {
@@ -452,13 +425,6 @@ export default {
       const ss = String(d.getSeconds()).padStart(2, "0");
       return `${yyyy}-${mm}-${dd} ${hh}:${mi}:${ss}`;
     },
-    // 将各种形式的日期值转换为时间戳，用于排序
-    getTimeValue(value) {
-      if (!value) return 0;
-      const d = new Date(value);
-      if (Number.isNaN(d.getTime())) return 0;
-      return d.getTime();
-    },
     // 点击“详情”：弹出对话框展示会议详细信息
     onView(row) {
       const lines = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",

package/src/controllers/meeting.controller.ts

@@ -3,9 +3,20 @@ import { Request, Response, NextFunction } from "express";
 import * as meetingService from "../services/meeting.service";
 
 class MeetingController {
-  getMeetingList = async (_req: Request, res: Response, next: NextFunction): Promise<void> => {
+  getMeetingList = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
     try {
-      const data = await meetingService.getMeetingList();
+      const { belOrgNo, meetSubj, meetTypeCd, startDate, endDate, page, pageSize, sortField, sortOrder } = req.query;
+      const data = await meetingService.getMeetingList({
+        belOrgNo,
+        meetSubj,
+        meetTypeCd,
+        startDate,
+        endDate,
+        page,
+        pageSize,
+        sortField,
+        sortOrder
+      });
       res.json({
         data
       });
@@ -16,4 +27,3 @@ class MeetingController {
 }
 
 export default new MeetingController();
-

package/src/services/meeting.service.ts

@@ -1,4 +1,38 @@
-export const getMeetingList = async () => {
+type Meeting = {
+  id: number;
+  belOrgNo: string;
+  organizationName: string;
+  meetSubj: string;
+  meetConte: string;
+  plainContent: string;
+  meetDt: string;
+  meetNo: string;
+  meetTypeCd: string;
+  displayName: string;
+  createTm: string;
+  updateTm: string;
+};
+
+type GetMeetingListInput = {
+  belOrgNo?: unknown;
+  meetSubj?: unknown;
+  meetTypeCd?: unknown;
+  startDate?: unknown;
+  endDate?: unknown;
+  page?: unknown;
+  pageSize?: unknown;
+  sortField?: unknown;
+  sortOrder?: unknown;
+};
+
+type GetMeetingListResult = {
+  list: Meeting[];
+  total: number;
+  page: number;
+  pageSize: number;
+};
+
+function getAllMeetings(): Meeting[] {
   return [
     {
       id: 33029032315325800,
@@ -29,5 +63,85 @@ export const getMeetingList = async () => {
       updateTm: "2026-01-15 19:56:24"
     }
   ];
-};
+}
+
+function toInt(value: unknown, fallback: number): number {
+  if (typeof value === "number" && Number.isFinite(value)) return Math.floor(value);
+  if (typeof value === "string" && value.trim() !== "") {
+    const parsed = Number.parseInt(value, 10);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return fallback;
+}
+
+function normalizeString(value: unknown): string {
+  if (typeof value !== "string") return "";
+  return value.trim();
+}
+
+function normalizeDateString(value: unknown): string {
+  if (typeof value !== "string") return "";
+  const trimmed = value.trim();
+  if (!trimmed) return "";
+  return trimmed.slice(0, 10);
+}
+
+function getTimeValue(value: unknown): number {
+  if (!value) return 0;
+  const str = typeof value === "string" ? value : String(value);
+  const normalized = str.length >= 10 ? str : str.slice(0, 10);
+  const d = new Date(normalized);
+  if (Number.isNaN(d.getTime())) return 0;
+  return d.getTime();
+}
 
+export const getMeetingList = async (input: GetMeetingListInput): Promise<GetMeetingListResult> => {
+  const belOrgNo = normalizeString(input.belOrgNo);
+  const meetSubj = normalizeString(input.meetSubj);
+  const meetTypeCd = normalizeString(input.meetTypeCd);
+  const startDate = normalizeDateString(input.startDate);
+  const endDate = normalizeDateString(input.endDate);
+
+  const pageSize = Math.max(1, Math.min(200, toInt(input.pageSize, 10)));
+  const page = Math.max(1, toInt(input.page, 1));
+
+  const sortField = normalizeString(input.sortField);
+  const sortOrder = input.sortOrder === "ascending" || input.sortOrder === "descending" ? input.sortOrder : "";
+
+  const all = getAllMeetings();
+
+  const filtered = all.filter((item) => {
+    if (belOrgNo && item.belOrgNo !== belOrgNo) return false;
+    if (meetTypeCd && item.meetTypeCd !== meetTypeCd) return false;
+    if (meetSubj && !item.meetSubj.includes(meetSubj)) return false;
+    if (startDate && endDate) {
+      const created = normalizeDateString(item.createTm);
+      if (!created || created < startDate || created > endDate) return false;
+    }
+    return true;
+  });
+
+  let sorted = filtered.slice();
+
+  if (sortField && sortOrder && (sortField === "createTm" || sortField === "updateTm")) {
+    const field = sortField as "createTm" | "updateTm";
+    const order = sortOrder === "ascending" ? 1 : -1;
+    sorted = sorted.sort((a, b) => {
+      const av = getTimeValue(a[field]);
+      const bv = getTimeValue(b[field]);
+      if (av === bv) return 0;
+      return av > bv ? order : -order;
+    });
+  }
+
+  const total = sorted.length;
+  const start = (page - 1) * pageSize;
+  const list = sorted.slice(start, start + pageSize);
+
+  return {
+    list,
+    total,
+    page,
+    pageSize
+  };
+};