From 56e99637df44dbd4e3cf977a38394d7e5d98db1a Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Thu, 22 Jul 2021 14:22:09 +0800
Subject: [PATCH] bug

---
 src/components/navMenu/index.vue              |  2 +-
 .../domesticStandardsAndRegulations/index.vue | 64 +++++++++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index bbdbd002c..51a708a74 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -303,7 +303,7 @@ export default {
             {
               title: '菜单管理',
               path: '/menuManage',
-              menuId: '82665e94d406c6fc0d1f627e5880230b'
+              menuId: '87b8b4f5817a7829696e63185c744d52'
             },
             {
               title: '链接管理',
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e49258c22..c1a4705e5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1915,7 +1915,9 @@ export default {
         synopsis: '',
         // replaceStandNumCope: '',
         replacedStandNum: '',
-        orderBy:''
+        orderBy:'',
+        nowOrder: '',
+        nowOrderBy: '',
       }, // 分页查询过程中用到的对象
       configStandList: [],
       configStandtotal: 0,
@@ -1931,6 +1933,8 @@ export default {
       delLoading: false,
       standState: '',
       orderBy :'',
+      nowOrder: '',
+      nowOrderBy: '',
       textStatusMap: {} // 文本状态id与name对应
     }
   },
@@ -2698,17 +2702,37 @@ export default {
     },
     // 表格排序
     sortChange (sortObj) {
+      console.log(sortObj, '升降序')
       debugger
       if (sortObj.column.order !== 'normal') {
-        switch (sortObj.column.property) {
+        switch (sortObj.prop) {
           case 'issueTime' :
             // 后台联调
-            this.orderBy = 'issueTime ' + sortObj.order
-            break
+            this.nowOrderBy = '1'
+            break;
+          case 'xcxssrq' :
+            // 后台联调
+            this.nowOrderBy = '2'
+            break;
+          case 'zccssrq' :
+            // 后台联调
+            this.nowOrderBy = '3'
+            break;
+            case 'textStatus' :
+            // 后台联调
+            this.nowOrderBy = '4'
+            break;
+        }
+        switch (sortObj.order) {
+          case 'ascending' :
+            this.nowOrder = '2'
+          break;
+          case 'descending' :
+            this.nowOrder = '1'
+          break;
         }
       }
       this.getDomesticStandardTable(this.tableFlag)
-
     },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange (data) {
@@ -3128,7 +3152,9 @@ export default {
       }
 
       // 排序
-      formData.orderBy = this.orderBy
+      formData.nowOrder = this.nowOrder
+      formData.nowOrderBy = this.nowOrderBy
+      // formData.orderBy = this.orderBy
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.id === 'wdsc') {
         formData.menuId = undefined
@@ -3831,12 +3857,28 @@ export default {
           switch (sortObj.prop) {
             case 'issueTime' :
               // 后台联调
-              this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order
-              break
-            case 'XCXSSRQ' :
+              this.sarConfigStandSearch.nowOrderBy = '1'
+              break;
+            case 'xcxssrq' :
               // 后台联调
-              this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order
-              break
+              this.sarConfigStandSearch.nowOrderBy = '2'
+              break;
+            case 'zccssrq' :
+              // 后台联调
+              this.sarConfigStandSearch.nowOrderBy = '3'
+              break;
+            case 'textStatus' :
+              // 后台联调
+              this.sarConfigStandSearch.nowOrderBy = '4'
+              break;
+          }
+          switch (sortObj.order) {
+            case 'ascending' :
+              this.sarConfigStandSearch.nowOrder = '2'
+              break;
+            case 'descending' :
+              this.sarConfigStandSearch.nowOrder = '1'
+              break;
           }
         }
       this.selectConfiguraStand()