From 51461f369f0b0ad1da96346afee5637302f1525b Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 18 八月 2026 16:38:47 +0800
Subject: [PATCH] 提交
---
src/views/sfstatistics/percentage/components/FirstFollowUp.vue | 315 ++++++++++++++++++++--------------------------------
1 files changed, 121 insertions(+), 194 deletions(-)
diff --git a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
index d766ae3..67d329f 100644
--- a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
@@ -793,202 +793,19 @@
},
customSort(data) {
- const order = [
- "涓�",
- "浜�",
- "涓�",
- "鍥�",
- "浜�",
- "鍏�",
- "涓�",
- "鍏�",
- "涔�",
- "鍗�",
- "鍗佷竴",
- "鍗佷簩",
- "鍗佷笁",
- "鍗佸洓",
- "鍗佷簲",
- "鍗佸叚",
- "鍗佷竷",
- "鍗佸叓",
- "鍗佷節",
- "浜屽崄",
- "浜屽崄涓�",
- "浜屽崄浜�",
- "浜屽崄涓�",
- "浜屽崄鍥�",
- "浜屽崄浜�",
- "浜屽崄鍏�",
- "浜屽崄涓�",
- "浜屽崄鍏�",
- "浜屽崄涔�",
- "涓夊崄",
- "涓夊崄涓�",
- "涓夊崄浜�",
- "涓夊崄涓�",
- "涓夊崄鍥�",
- "涓夊崄浜�",
- "涓夊崄鍏�",
- "涓夊崄涓�",
- "涓夊崄鍏�",
- "涓夊崄涔�",
- "鍥涘崄",
- "鍥涘崄涓�",
- "鍥涘崄浜�",
- "鍥涘崄涓�",
- "鍥涘崄鍥�",
- "鍥涘崄浜�",
- ];
-
- return data.sort((a, b) => {
- const getIndex = (name) => {
- if (!name || typeof name !== "string") return -1;
- const chineseMatch = name.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
- if (chineseMatch && chineseMatch[1]) {
- return order.indexOf(chineseMatch[1]);
- }
- const arabicMatch = name.match(/^(\d+)/);
- if (arabicMatch && arabicMatch[1]) {
- const num = parseInt(arabicMatch[1], 10);
- if (num >= 1 && num <= 45) {
- return num - 1;
- }
- }
- return -1;
- };
-
- const indexA = getIndex(a.leavehospitaldistrictname);
- const indexB = getIndex(b.leavehospitaldistrictname);
-
- if (indexA === -1 && indexB === -1) {
- return (a.leavehospitaldistrictname || "").localeCompare(
- b.leavehospitaldistrictname || ""
- );
- }
- if (indexA === -1) return 1;
- if (indexB === -1) return -1;
- return indexA - indexB;
- });
- },
- Tooltipcgl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content: "闅忚鎴愬姛/(闇�闅忚-寰呴殢璁�)",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
+ return data.sort((a, b) =>
+ this.compareWardName(
+ a.leavehospitaldistrictname,
+ b.leavehospitaldistrictname
+ )
);
},
- Tooltipjsl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content:
- "(鍑洪櫌鏃堕棿+浠诲姟鍛ㄦ湡)灏忎簬瀹屾垚鏃堕棿鍗充负瓒呮椂;(闇�闅忚-瓒呮椂)/闇�闅忚",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
- );
- },
- Tooltipsfl(h, { column }) {
- return h(
- "el-tooltip",
- {
- props: {
- content: "(闅忚鎴愬姛+棣栨闅忚澶辫触)/棣栨搴旈殢璁�",
- placement: "top",
- effect: "dark",
- },
- },
- [h("span", column.label)]
- );
- },
+
sortChineseNumber(aRow, bRow) {
- const a = aRow.leavehospitaldistrictname;
- const b = bRow.leavehospitaldistrictname;
-
- const chineseNumMap = {
- 涓�: 1,
- 浜�: 2,
- 涓�: 3,
- 鍥�: 4,
- 浜�: 5,
- 鍏�: 6,
- 涓�: 7,
- 鍏�: 8,
- 涔�: 9,
- 鍗�: 10,
- 鍗佷竴: 11,
- 鍗佷簩: 12,
- 鍗佷笁: 13,
- 鍗佸洓: 14,
- 鍗佷簲: 15,
- 鍗佸叚: 16,
- 鍗佷竷: 17,
- 鍗佸叓: 18,
- 鍗佷節: 19,
- 浜屽崄: 20,
- 浜屽崄涓�: 21,
- 浜屽崄浜�: 22,
- 浜屽崄涓�: 23,
- 浜屽崄鍥�: 24,
- 浜屽崄浜�: 25,
- 浜屽崄鍏�: 26,
- 浜屽崄涓�: 27,
- 浜屽崄鍏�: 28,
- 浜屽崄涔�: 29,
- 涓夊崄: 30,
- 涓夊崄涓�: 31,
- 涓夊崄浜�: 32,
- 涓夊崄涓�: 33,
- 涓夊崄鍥�: 34,
- 涓夊崄浜�: 35,
- 涓夊崄鍏�: 36,
- 涓夊崄涓�: 37,
- 涓夊崄鍏�: 38,
- 涓夊崄涔�: 39,
- 鍥涘崄: 40,
- 鍥涘崄涓�: 41,
- 鍥涘崄浜�: 42,
- 鍥涘崄涓�: 43,
- 鍥涘崄鍥�: 44,
- 鍥涘崄浜�: 45,
- };
-
- const getNumberFromText = (text) => {
- if (!text || typeof text !== "string") return -1;
- const match = text.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
- if (match && match[1]) {
- const chineseNum = match[1];
- return chineseNumMap[chineseNum] !== undefined
- ? chineseNumMap[chineseNum]
- : -1;
- }
- const arabicMatch = text.match(/^(\d+)/);
- if (arabicMatch && arabicMatch[1]) {
- const num = parseInt(arabicMatch[1], 10);
- return num >= 1 && num <= 45 ? num : -1;
- }
- return -1;
- };
-
- const numA = getNumberFromText(a);
- const numB = getNumberFromText(b);
-
- if (numA === -1 && numB === -1) {
- return (a || "").localeCompare(b || "");
- }
- if (numA === -1) return 1;
- if (numB === -1) return -1;
- return numA - numB;
+ return this.compareWardName(
+ aRow.leavehospitaldistrictname,
+ bRow.leavehospitaldistrictname
+ );
},
getRowKey(row) {
@@ -1125,7 +942,46 @@
return sums;
},
-
+ Tooltipcgl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "闅忚鎴愬姛/(闇�闅忚-寰呴殢璁�)",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipjsl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content:
+ "(鍑洪櫌鏃堕棿+浠诲姟鍛ㄦ湡)灏忎簬瀹屾垚鏃堕棿鍗充负瓒呮椂;(闇�闅忚-瓒呮椂)/闇�闅忚",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
+ Tooltipsfl(h, { column }) {
+ return h(
+ "el-tooltip",
+ {
+ props: {
+ content: "(闅忚鎴愬姛+棣栨闅忚澶辫触)/棣栨搴旈殢璁�",
+ placement: "top",
+ effect: "dark",
+ },
+ },
+ [h("span", column.label)]
+ );
+ },
getInnerSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -1212,6 +1068,77 @@
return Number.isInteger(num) ? num.toString() : num.toFixed(0);
},
+ // ===== 鐥呭尯鍚嶆帓搴忥紙鏀寔 1-B10 / 2-A2 绛� 鏁板瓧-瀛楁瘝鏁板瓧 鏍煎紡锛� =====
+ // 瑙ｆ瀽鐥呭尯鍚嶏紝杩斿洖鎺掑簭閿� { group, letter, number }
+ parseWardKey(name) {
+ if (!name || typeof name !== "string") return null;
+ const trimmed = name.trim();
+
+ // 鏍煎紡1锛氭暟瀛�-瀛楁瘝鏁板瓧锛屽 1-B10銆�2-A2銆�1-A11
+ const dashMatch = trimmed.match(/^(\d+)-([A-Za-z]+)(\d+)/);
+ if (dashMatch) {
+ return {
+ group: parseInt(dashMatch[1], 10),
+ letter: dashMatch[2].toUpperCase(),
+ number: parseInt(dashMatch[3], 10),
+ };
+ }
+
+ // 鏍煎紡2锛氫腑鏂囨暟瀛楀紑澶达紝濡� 涓�鐥呭尯銆佸崄涓�鐥呭尯銆佷簩鍗佷竴鐥呭尯
+ const cnMatch = trimmed.match(/^([涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+)/);
+ if (cnMatch && cnMatch[1]) {
+ const num = this.chineseToNumber(cnMatch[1]);
+ if (num > 0) return { group: num, letter: "", number: 0 };
+ }
+
+ // 鏍煎紡3锛氶樋鎷変集鏁板瓧寮�澶达紝濡� 1鐥呭尯銆�12鐥呭尯
+ const numMatch = trimmed.match(/^(\d+)/);
+ if (numMatch && numMatch[1]) {
+ return { group: parseInt(numMatch[1], 10), letter: "", number: 0 };
+ }
+
+ return null;
+ },
+
+ // 涓枃鏁板瓧杞樋鎷変集鏁板瓧锛堟敮鎸� 涓� ~ 涔濆崄涔濓級
+ chineseToNumber(str) {
+ const digits = {
+ 涓�: 1,
+ 浜�: 2,
+ 涓�: 3,
+ 鍥�: 4,
+ 浜�: 5,
+ 鍏�: 6,
+ 涓�: 7,
+ 鍏�: 8,
+ 涔�: 9,
+ };
+ if (!str) return -1;
+ if (str === "鍗�") return 10;
+ if (str.startsWith("鍗�")) return 10 + (digits[str[1]] || 0);
+ if (str.includes("鍗�")) {
+ const parts = str.split("鍗�");
+ const tens = digits[parts[0]] || 0;
+ const ones = digits[parts[1]] || 0;
+ return tens * 10 + ones;
+ }
+ return digits[str] !== undefined ? digits[str] : -1;
+ },
+
+ // 鐥呭尯鍚嶆瘮杈冨櫒锛氭暟瀛楁 鈫� 瀛楁瘝娈� 鈫� 鏁板瓧娈�
+ compareWardName(nameA, nameB) {
+ const ka = this.parseWardKey(nameA);
+ const kb = this.parseWardKey(nameB);
+
+ if (!ka && !kb) return (nameA || "").localeCompare(nameB || "", "zh-CN");
+ if (!ka) return 1;
+ if (!kb) return -1;
+
+ if (ka.group !== kb.group) return ka.group - kb.group;
+ if (ka.letter !== kb.letter) return ka.letter.localeCompare(kb.letter);
+ return ka.number - kb.number;
+ },
+
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.tagid);
},
--
Gitblit v1.9.3