From c24a5a2a99515b365ebc343b04538bb862790de1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十二月 2023 11:44:22 +0800
Subject: [PATCH] Merge branch 'feature-code-refactoring' and 'feature-002'

---
 src/views/risk_assessment/DataIndexRank.vue |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/risk_assessment/DataIndexRank.vue b/src/views/risk_assessment/DataIndexRank.vue
index 04cbec1..54a3d0d 100644
--- a/src/views/risk_assessment/DataIndexRank.vue
+++ b/src/views/risk_assessment/DataIndexRank.vue
@@ -36,7 +36,10 @@
         // 缁撴潫鏃堕棿
         endTime: ''
       },
-      tableHeight: '600'
+      tableHeight: '600',
+
+      orderProp: 'dayAvg',
+      order: 'descending'
     }
   },
   setup() {
@@ -96,12 +99,12 @@
         }
       }
 
-      //  鍦ㄧ嚎鐜囷紝鏈夋晥鐜� 涓嶆弧瓒虫爣鍑嗘椂 鍙橀鑹�
       if (columnIndex == 7) {
         if (row.dayOnline < 0.9) {
           return 'red-color'
         }
       }
+
       if (columnIndex == 8) {
         if (row.dayValid < 0.9) {
           return 'red-color'
@@ -145,14 +148,17 @@
 
     // 鐐瑰嚮缁熻鎸夐挳
     fetchData(p) {
-      const { prop, order } = p ? p : { prop: 'dayAvg', order: 'descending' }
+      if (p) {
+        this.orderProp = p.prop
+        this.order = p.order
+      }
       let params = {
         page: this.currentPage,
         pageSize: this.pageSize,
         siteName: '',
-        orderProp: prop,
+        orderProp: this.orderProp,
         //鎺掑簭 ascending 姝e簭锛宒escending 闄嶅簭
-        asc: order == 'ascending'
+        asc: this.order == 'ascending'
       }
       if (this.form.beginTime) {
         params['beginTime'] = this.form.beginTime
@@ -179,7 +185,9 @@
     },
     openDetail(row) {
       const encodedSiteName = encodeURIComponent(row.name)
-      this.$router.push(`/exceptionDetail/${encodedSiteName}/${row.lst}`)
+      const timeType = '0'
+      const jumpPage = '2'
+      this.$router.push(`/exceptionDetail/${encodedSiteName}/${row.lst}/${timeType}/${jumpPage}`)
     }
   }
 }

--
Gitblit v1.9.3