年度参数排序问题

src/views/SchedulingPage/AnnualParamPage.vue

@@ -386,37 +386,16 @@ function resetSearch() {
   searchKey.value = ''
   getData()
 }
+function sortByYear(a, b) {
+  const yearDiff = a.year - b.year;
+  if (yearDiff !== 0) return yearDiff;
 
-function customSort(a, b) {
-  let valA;
-  let valB;
-  if (a.energyType === '一步节能') {
-    valA = 4
-  } else if (a.energyType === '二步节能') {
-    valA = 3
-  } else if (a.energyType === '三步节能') {
-    valA = 2
-  } else if (a.energyType === '四步节能') {
-    valA = 1
-  } else if (a.energyType === '非节能') {
-    valA = 5
-  } else {
-    valA = 6
-  }
-  if (b.energyType === '一步节能') {
-    valB = 4
-  } else if (b.energyType === '二步节能') {
-    valB = 3
-  } else if (b.energyType === '三步节能') {
-    valB = 2
-  } else if (b.energyType === '四步节能') {
-    valB = 1
-  } else if (b.energyType === '非节能') {
-    valB = 5
-  } else {
-    valB = 6
-  }
-  return valA - valB
+  const energyLevels = { '一步节能': 4, '二步节能': 3, '三步节能': 2, '四步节能': 1, '非节能': 5 };
+  return energyLevels[a.energyType] - energyLevels[b.energyType];
+}
+function sortByEnergyLevel(a, b) {
+  const energyLevels = { '一步节能': 4, '二步节能': 3, '三步节能': 2, '四步节能': 1, '非节能': 5 };
+  return energyLevels[a.energyType] - energyLevels[b.energyType];
 }
 
 function getSupply() {
@@ -467,9 +446,9 @@ function getOrganizationStructure() {
           style="width: 100%"
       >
         <el-table-column label="序号" type="index" align="center" width="100"/>
-        <el-table-column label="节能类型" sortable :sort-method="customSort" prop="energyType" width="150"/>
+        <el-table-column label="节能类型" sortable  :sort-method="(a, b) => sortByEnergyLevel(a, b)"  :sort-by="['energyType']" prop="energyType" width="150"/>
         <el-table-column label="供热站名称" prop="supplyName" width="200"/>
-        <el-table-column label="年度" sortable :sort-method="customSort" prop="year" width="150"/>
+        <el-table-column label="年度" sortable  :sort-method="(a, b) => sortByYear(a, b)" :sort-by="['year', 'energyType']" prop="year" width="150"/>
         <el-table-column label="热指标(W/m²)" prop="standard" width="150"/>
         <el-table-column label="度日数标定值" prop="degreeStandard" width="200"/>
         <el-table-column label="室内温度(℃)" prop="indoorTemperature" width="150"/>