From 6d70cc7e905146f3edebb420d2d880fcfe156853 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 2 Jul 2022 13:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 35 ++++++++++++-------
 .../ParameterItemCollectionList.vue           |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 7ee83c1f0..cc7ae0aa4 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -261,7 +261,8 @@
     watch: {
       currentPersonRole: {
         handler: function() {
-          this.getTableList();
+          console.log(123)
+          this.getTableList()
         },
         immediate: true
       }
@@ -377,7 +378,7 @@
         this.areaVisible = true
         // this.$refs.ruleForm.clearValidate()
         this.$nextTick(() => {
-          this.Dateline = {...this.Dateline}
+          this.Dateline = { ...this.Dateline }
           this.getquerySdtList(record)
           this.$refs.ruleForm.clearValidate()
         })
@@ -406,17 +407,19 @@
       getAndUserId(result) {
         let query = {
           paramsManifestId: this.$route.query.id,
-          projectId:this.$route.query.projectId,
+          projectId: this.$route.query.projectId,
           userId: this.userInfo().id
         }
         getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
           if (res.success) {
-            if (res.result && res.result.userType){
+            if (res.result && res.result.userType) {
               this.getTableList(res.result.userType)
-            }else{
+              console.log(11)
+            } else {
+              console.log(222)
               this.getTableList(result[0].value)
             }
-            this.$emit('LoginUserType', result, this.currentPersonRole,res.result.userType)
+            this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
           } else {
 
           }
@@ -532,7 +535,9 @@
             this.dataSource = tt
             this.total = res.result.total
             this.selectedRowKeys = []
-            this.loading = false
+            setTimeout(() => {
+              this.loading = false
+            }, 500)
           } else {
             this.loading = false
           }
@@ -616,7 +621,9 @@
             this.selectedRowrowValue = []
             this.$emit('value', this.selectedRowKeys)
             this.$emit('rowValue', this.selectedRowrowValue)
-            this.loading = false
+            setTimeout(() => {
+              this.loading = false
+            }, 500)
           } else {
             this.loading = false
           }
@@ -638,7 +645,7 @@
       detailClick(item, index) {
         // this.$emit('detailClick', item)
       }
-    },
+    }
   }
 </script>
 <style lang='less'>
@@ -734,10 +741,12 @@
     transform: none !important;
     bottom: 0;
   }
-  .rowClassRed{
-     background: #f3d9de;
+
+  .rowClassRed {
+    background: #f3d9de;
   }
-  .rowClassRedYellow{
-      background: yellow;
+
+  .rowClassRedYellow {
+    background: yellow;
   }
 </style>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 2ee7d3388..ca847d402 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -817,7 +817,7 @@
       LoginUserType(val, currentPersonRole,userType) {
         this.RoleType = []
         if (this.currentPersonRole == '') {
-          this.currentPersonRole = val.length >= 1 ? val[0].value : ''
+          this.currentPersonRole = currentPersonRole || userType || val[0].value
         }
         this.RoleType = val
         this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value