Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/views/SchedulingPage/AnnualParamPage.vue

@@ -7,6 +7,7 @@ import {vFloatNumber} from "@/utils/directives.js";
 
 const data = ref()
 const dataBackup = ref([])
+const elTableRef = ref()
 const tableHeaderClass = data => {  // 表头样式
   return 'table-header-class'
 }
@@ -151,9 +152,38 @@ function resetInput() {
   }
 }
 
-function energyTypeSort(){
-  return ['一步节能','二步节能','三步节能','四步节能','非节能']
-} // 节能类型排序自定义方法
+function customSort(a,b){
+  let valA;
+  let valB;
+  if(a.energyType === '一步节能'){
+    valA = 1
+  }else if(a.energyType === '二步节能'){
+    valA = 2
+  }else if(a.energyType === '三步节能'){
+    valA = 3
+  }else if(a.energyType === '四步节能'){
+    valA = 4
+  }else if(a.energyType === '非节能'){
+    valA = 5
+  }else {
+    valA = 6
+  }
+  if(b.energyType === '一步节能'){
+    valB = 1
+  }else if(b.energyType === '二步节能'){
+    valB = 2
+  }else if(b.energyType === '三步节能'){
+    valB = 3
+  }else if(b.energyType === '四步节能'){
+    valB = 4
+  }else if(b.energyType === '非节能'){
+    valB = 5
+  }else {
+    valB = 6
+  }
+  return valA - valB
+}
+
 </script>
 
 <template>
@@ -173,12 +203,13 @@ function energyTypeSort(){
           :data="data"
           border
           stripe
+          ref="elTableRef"
           :default-sort="{prop: 'year', order: 'descending'}"
           :header-cell-class-name="tableHeaderClass"
           :row-class-name="tableBodyClass"
           style="width: 100%">
         <el-table-column label="序号" type="index" align="center" width="60"/>
-        <el-table-column label="节能类型" sortable :sort-method="energyTypeSort" prop="energyType"/>
+        <el-table-column label="节能类型" sortable :sort-method="customSort" prop="energyType"/>
         <el-table-column label="年度" sortable prop="year"/>
         <el-table-column label="热指标(W/m²)" prop="standard"/>
         <el-table-column label="度日数标定值" prop="degreeStandard"/>

src/views/SchedulingPage/PhenomenonPage.vue

@@ -113,6 +113,9 @@ function getData(){
     dataBackup.value = [...data.value]
   })
 }
+function customSort(a,b){
+  return a.phenomenonType - b.phenomenonType
+}
 </script>
 <template>
 <div class="phenomenon-container">
@@ -135,7 +138,7 @@ function getData(){
         :header-cell-class-name="tableHeaderClass"
         :row-class-name="tableBodyClass">
       <el-table-column type="index" label="序号" align="center" width="100"/>
-      <el-table-column prop="phenomenonName" label="名称"/>
+      <el-table-column prop="phenomenonName" sortable :sort-method="customSort" label="名称"/>
       <el-table-column prop="phenomenonTemp" label="对应温度"/>
       <el-table-column prop="phenomenonDesc" label="描述"/>
       <el-table-column label="操作" width="190">

src/views/SchedulingPage/WindManagePage.vue

@@ -121,6 +121,10 @@ function resetInput() {
     windDesc: "",
   };
 }
+
+function customSort(a, b) {
+  return a.windLevel - b.windLevel;
+}
 </script>
 <template>
   <div class="windManage-container">
@@ -160,17 +164,15 @@ function resetInput() {
         :row-class-name="tableBodyClass"
       >
         <el-table-column type="index" label="序号" align="center" width="100" />
-        <el-table-column prop="windLevel" label="级数" />
+        <el-table-column prop="windLevel" sortable :sort-method="customSort" label="级数" />
         <el-table-column prop="windTemp" label="对应温度" />
         <el-table-column prop="windDesc" label="描述" />
         <el-table-column label="操作" width="190">
           <template #default="scope">
             <div class="table-operate-column">
               <el-button link @click="revise(scope.row)" type="primary"
-                >修改</el-button
-              >
-              <el-button link @click="omit(scope.row)" type="primary"
-                >删除</el-button
+                >修改</el-button>
+              <el-button link @click="omit(scope.row)" type="primary">删除</el-button
               >
             </div>
           </template>