Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220

src/views/report/Overvoewnew.vue

@@ -159,6 +159,7 @@
     <!-- 以下为table表格 -->
     <div class="tableBox">
       <a-table
+          rowKey="id"
           :columns="columns"
           :data-source="tableData"
           :loading="tableLoading"
@@ -211,7 +212,7 @@ import dayjs from "dayjs";
 import {message} from "ant-design-vue";
 import Cookies from "vue-cookies";
 import {useStore} from "vuex";
-// import orgjson from './org.json';
+import orgjson from './org.json';
 import PostSelectNew from "@/components/growthpath/PostSelect.vue";
 import OfficeSelect from "@/components/growthpath/OfficeSelect.vue";
 import draggable from 'vuedraggable';
@@ -403,8 +404,8 @@ export default {
         }
       }
 
-      const res = await api.userGetUserOrg({});
-      // const res = orgjson;
+      // const res = await api.userGetUserOrg({});
+      const res = orgjson;
       if (res != null && res.data != null && res.data.result != null && res.data.result.orgTreeList != null) {
         orgArray = flattenOrgTree(res.data.result.orgTreeList);
       }
@@ -1761,6 +1762,7 @@ export default {
 
     // 获取名称路径的函数
     function findPathByValue(data, value) {
+      debugger;
       function recursiveSearch(nodes, value, path) {
         for (let node of nodes) {
           if (node.value === value) {