修改冲突

src/views/sluice/runManage/monitoring/sluice/index.vue

@@ -2,7 +2,7 @@
 <script>
 import {getDicts} from "@/api/management";
 import { getAreasData } from "@/api/areas/index";
-import { getSluiceProjectList } from "@/api/sluice/index";
+import { getRunProjectList } from "@/api/sluice/index";
 let that
 export default {
   name: "sluice",
@@ -77,7 +77,7 @@ export default {
     },
     // 获取列表数据
     getTableData() {
-      getSluiceProjectList({
+      getRunProjectList({
         data: {
           timeView: {
             timeField: "create_time",
@@ -129,6 +129,7 @@ export default {
     getDicts("sluice_type").then((res) => {
       this.sluiceType = res.data;
     });
+    console.log(123)
     await this.getTreeData();
     // 获取列表数据
     await this.getTableData();