Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css

business-css/frontend/src/api/business/event/index.ts

@@ -32,14 +32,14 @@ export function eventsBatchSave(data:any){
 // }
 
 
-// //单个删除项目
-// export function deleteScenarios(queryParams:any){
-//   return request({
-//     url:'/events/'+queryParams.id ,
-//     method: 'delete'
-//     // params: queryParams
-//   });
-// }
+// //单个删除事件
+export function deleteEvents(eventId:any){
+  return request({
+    url:'/events/'+eventId ,
+    method: 'delete'
+    // params: queryParams
+  });
+}
 // //多选删除项目
 // export function deleteBatchScenarios(queryParams:any){
 //   return request({

business-css/frontend/src/components/antvx6/index.vue

@@ -1688,6 +1688,13 @@ const  confirmCopyClick  = async ()=>{
   loading.value = false
   saveDesign(false)
   isCopy.value = false
+  let json = graph.toJSON()
+  tabDeviceNum.value = 0
+  for(let i = 0; i < json.cells.length; i++){
+    if(json.cells[i].shape == 'custom-image'){
+      tabDeviceNum.value++
+    }
+  }antvStatus.value = '复制设备'
 }