Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1142,7 +1142,8 @@ export default {
       this.selectedList = []
       this.selectedAllList = data
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id,data[i].editFlag)
+        this.selectedList.push(data[i].id)
+        this.selectedList1.push(data[i].editFlag)
       }
     },
     // 分页点击后方法
@@ -1407,6 +1408,7 @@ export default {
           confirmButtonClass: 'common-button-primary',
           roundButton: false
         }).then(() => {
+          this.loading = true
           this.deleteItemsModal = false
           this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
             ids: this.selectedList.join(','),
@@ -1427,6 +1429,7 @@ export default {
               nodeId = currentNode.id
             }
             this.selectSarMenu.id = nodeId
+            this.loading = false
           }, e => {
           })
         }).catch(() => {})