feat: 新增了资产授权时,给父级授权同时也会给子级部门以及用户授权

src/views/etl/assetAuthorization/auth/AuthDataSource.vue

@@ -135,8 +135,8 @@ export default {
     };
   },
   created() {
-    this.loading = true;
+    // this.loading = true;
-    setTimeout(() => this.loading = false, 200)
+    // setTimeout(() => this.loading = false, 200)
   },
   methods: {
     recursion(deptInfo){
@@ -153,6 +153,7 @@ export default {
       return ids
     },
     authChange(row) {
+      this.loading = true
       this.sourceAccreditReq={
         deptIds:null,
           userId: null,
@@ -176,7 +177,6 @@ export default {
           this.getSourceAccreditByDataSourceId()
         })
       }
-
     },
     parseTime,
     getSourceAccreditByDataSourceId(){
@@ -186,6 +186,7 @@ export default {
           this.userAccreditIds = response.data.userAccreditModelIds
           setTimeout(() => this.getList(), 50)
           setTimeout(() => this.getUserList(), 50)
+          this.loading = false
         })
       }
 
@@ -209,8 +210,6 @@ export default {
           // dept.isAuth = this.deptAccreditIds.indexOf(dept.deptId) > -1
           this.recursionAuth(dept)
         })
-        console.log(this.deptList)
-        this.loading = false;
       });
     },
     /** 查询用户列表 */

src/views/etl/assetAuthorization/auth/AuthTable.vue

@@ -145,8 +145,6 @@ export default {
     };
   },
   created() {
-    this.loading = true;
-    setTimeout(() => this.loading = false, 200)
   },
   methods: {
     recursion(deptInfo){
@@ -163,6 +161,7 @@ export default {
       return ids
     },
     authChange(row) {
+      this.loading = true
       this.AssetAccreditReq={
         deptIds:null,
         userId: null,
@@ -206,6 +205,7 @@ export default {
           this.userAccreditIds = response.data.userAccreditModelIds
           setTimeout(() => this.getList(), 50)
           setTimeout(() => this.getUserList(), 50)
+          this.loading = false
         })
       }
     },
@@ -216,7 +216,6 @@ export default {
         this.deptList.forEach(dept => {
           this.recursionAuth(dept)
         })
-        this.loading = false;
       });
     },
     /** 查询用户列表 */

src/views/etl/assetAuthorization/index.vue

@@ -81,7 +81,6 @@ export default {
       }
       listSource(this.queryParams).then(response => {
         this.sourceList = response.data.rows;
-        console.log(this.sourceList)
         this.sourceList.forEach(source => {
           source.label=source.dataSourceName+'('+source.databaseName+'-'+source.systemName+')'
           source.dataType = 'dataSource'

src/views/etl/assetShow/modules/dataSourceShow.vue

@@ -19,7 +19,7 @@ export default {
   watch:{
     'source':{
       handler(val){
-        setTimeout(() => this.inio(), 100)
+        setTimeout(() => this.inio(), 200)
       },
       immediate: true
     }

src/views/etl/source/index.vue

@@ -330,9 +330,6 @@ export default {
           databaseName: [
             {required: true, message: "数据库名称不能为空", trigger: "blur"}
           ],
-          connectionParam: [
-            {required: true, message: "数据连接参数不能为空", trigger: "blur"}
-          ],
           initNum: [
             {required: true, message: "初始连接数量不能为空", trigger: "blur"}
           ],
@@ -420,7 +417,6 @@ export default {
       listSource(this.queryParams).then(response => {
         this.sourceList = response.data.rows;
         this.total = response.data.total;
-        console.log(this.sourceList)
         this.loading = false;
       });
     },
@@ -485,13 +481,15 @@ export default {
         this.form = res.data;
         console.log(this.form)
         this.dataSourceParamList = [];
-        this.form.connectionParam.split("&").forEach(param => {
+        if (this.form.connectionParam){
-          let paramArr = param.split("=");
+          this.form.connectionParam.split("&").forEach(param => {
-          this.dataSourceParamList.push({
+            let paramArr = param.split("=");
-            name: paramArr[0],
+            this.dataSourceParamList.push({
-            val: paramArr[1]
+              name: paramArr[0],
+              val: paramArr[1]
+            })
           })
-        })
+        }
         this.open = true;
         this.title = "修改数据接入";
       })