Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/iotc

ruoyi-ui-vue3/src/views/device/equipmentdash/index.vue

@@ -184,6 +184,7 @@ import { useRoute, useRouter } from "vue-router";
 import { listEquipmentOrganizational, addEquipmentOrganizational, updateEquipmentOrganizational } from "@/api/data/equipmentOrganizational"
 import { listEquipmentSbook, updateEquipmentSbook } from "@/api/data/equipmentSbook"
 import { getDicts } from '@/api/system/dict/data'
+import {cloneDeep} from "lodash";
 
 
 
@@ -387,8 +388,12 @@ const saveOrgainzational = () => {
     }
   }
   console.log(organizationalQuery.value.id);
+
   if (organizationalQuery.value.id != null) {
-    updateEquipmentOrganizational(organizationalQuery.value).then(res => {
+    let datac = cloneDeep(organizationalQuery.value);
+    delete  datac.parentNode;
+    delete  datac.children;
+    updateEquipmentOrganizational(datac).then(res => {
       console.log(res);
       if (res.code == 200) {
         getTreedata();
@@ -396,7 +401,10 @@ const saveOrgainzational = () => {
       }
     })
   } else {
-    addEquipmentOrganizational(organizationalQuery.value).then(res => {
+    let datac = cloneDeep(organizationalQuery.value);
+    delete  datac.parentNode;
+    delete  datac.children;
+    addEquipmentOrganizational(datac).then(res => {
       if (res.code == 200) {
         getTreedata();
         dialogFormVisible.value = false