业务95值计算、服务器收益和交换机收益的图形分析、自定义列、修复bug

src/views/earnManage/busValueCount/details.vue

@@ -61,9 +61,13 @@
             });
           });
         } else {
+          this.$modal.loading();
           switchNameTree().then(val => {
             this.switchNameList = val && val;
             this.formList[0].controls.includedResources['options'] = val && val.data;
+            this.$modal.closeLoading();
+          }).catch(() => {
+            this.$modal.closeLoading();
           });
         }
       },
@@ -104,8 +108,15 @@
               break;
             case 'submit':
               dataVal['calculationMode'] = this.paramsData.calculationMode;
+              if (dataVal.includedResources) {
+                let newArr = [];
+                dataVal.includedResources.forEach(item => {
+                  newArr.push(item[1]);
+                });
+                dataVal.includedResources = newArr.toString();
+              }
               if (dataVal.includedResourcesTree) {
-                dataVal.includedResources = dataVal.includedResources.toString();
+                dataVal.includedResources = dataVal.includedResourcesTree.toString();
                 delete dataVal.includedResourcesTree;
               }
               if (dataVal && dataVal.businessName) {
@@ -115,7 +126,6 @@
                 dataVal.startTime = dataVal.endTime[0];
                 dataVal.endTime = dataVal.endTime[1];
               }
-              console.log('dataVal===',dataVal);
               addTaskStatic(dataVal).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$router.push("/earnManage/busValueCount");