From 0fc338f4f46af96031881bc2662543251ef1e1d5 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 15 Jun 2022 15:04:24 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 19 +++++++++++++++++--
 .../ParameterItemCollectionList.vue           |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 3e9d42218..15b53388d 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -454,6 +454,23 @@
         this.loading = true
         getAction(url, params).then((res) => {
           if (res.success) {
+            // todo
+            // console.log(res.result,'res.result')
+            // let tt = []
+            // this.dataSource = []
+            // // 需要转化数据类型
+            // tt = res.result
+            // tt.forEach((Obj) => {
+            //   Object.keys(Obj).forEach((item) => {
+            //     if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){
+            //       Obj[item].list.forEach((itemLi) => {
+            //         if(itemLi.type === 'pull_more'){
+            //           itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.splice(',')
+            //         }
+            //       })
+            //     }
+            //   })
+            // })
             this.dataSource = res.result
             this.total = res.result.total
             this.selectedRowKeys = []
@@ -464,8 +481,6 @@
         })
       },
       onChange(page, pageSize) {
-        // this.pageNo = page
-        // this.getTableList()
       },
       onSelectChange(value, rowValue) {
         this.selectedRowKeys = value
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 665391e07..541e152cc 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -823,7 +823,7 @@ export default {
           if (res.data.success) {
             this.FreezeList = res.data.result
           }else{
-            _this.$message.warning(res.data.result)
+            _this.$message.warning(res.data.message)
           }
         })
         .catch( (error) =>{