代码提交

wj-smartcity/src/views/dataQueries/rightForm/RealTimeData.vue

@@ -180,7 +180,8 @@ export default {
         new Date(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24)),
         new Date(),
       ];
-    if (this.crossData.crossId) {
+    // if (this.crossData.crossId) {
+    if (this.crossData.id) {
       this.getData();
     }
   },

wj-smartcity/src/views/dataQueries/rightForm/cycleData.vue

@@ -238,7 +238,8 @@ export default {
         new Date(),
       ];
     }
-    if (this.crossData.crossId) {
+    // if (this.crossData.crossId) {
+    if (this.crossData.id) {
       this.getData();
     }
   },
@@ -267,7 +268,8 @@ export default {
       if (this.locationType1 === "laneSort") {
         this.exportLoading = true
         exportLane({
-          crossId: this.crossData.crossId,
+          // crossId: this.crossData.crossId,
+          crossId: this.crossData.id,
           end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
           start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
         }).then((response) => {
@@ -279,7 +281,8 @@ export default {
       else{
         this.exportLoading = true
         exportTurn({
-          crossId: this.crossData.crossId,
+          // crossId: this.crossData.crossId,
+          crossId: this.crossData.id,
           end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
           start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
         }).then((response) => {
@@ -689,7 +692,8 @@ export default {
       this.loading = true;
       this.indexOptionValue = ["allFlow"];
       let params = {
-        crossId: this.crossData.crossId,
+        // crossId: this.crossData.crossId,
+        crossId: this.crossData.id,
         end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
         start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
         granularity: "1h",
@@ -724,7 +728,8 @@ export default {
             let haveFlag = false;
             for (let i = 0; i < a.length; i++) {
               if (
-                a[i].crossId === b.crossId &&
+                // a[i].crossId === b.crossId &&
+                a[i].id === b.id &&
                 a[i].fRidDir === b.fRidDir &&
                 a[i].windowEndTime === b.windowEndTime
               ) {

wj-smartcity/src/views/dataQueries/rightForm/eventData.vue

@@ -288,7 +288,8 @@ export default {
         new Date(),
       ];
     }
-    if (this.crossData.crossId) {
+    // if (this.crossData.crossId) {
+    if (this.crossData.id) {
       this.getData();
     }
   },
@@ -334,7 +335,8 @@ export default {
     getData() {
       // 停车事件
       getHoloEventList({
-        crossId: this.crossData.crossId,
+        // crossId: this.crossData.crossId,
+        crossId: this.crossData.id,
         end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
         start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
         types: "401,",
@@ -361,7 +363,8 @@ export default {
       //   });
       // });
       overFlowEvent({
-        crossId: this.crossData.crossId,
+        // crossId: this.crossData.crossId,
+        crossId: this.crossData.id,
         end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
         overFlow: true,
         pageNum: 0,

wj-smartcity/src/views/dataQueries/rightForm/snapshotData.vue

@@ -371,7 +371,8 @@ export default {
       this.exportLoading = true;
       // excel导出下载
       exportSnapshot({
-        crossId: this.crossData.crossId,
+        // crossId: this.crossData.crossId,
+        crossId: this.crossData.id,
         end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
         start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
         laneId: this.value1.join(","),
@@ -385,7 +386,8 @@ export default {
       if (this.value1.length) {
         this.indexOptionValue = ["queueLength"];
         let params = {
-          crossId: this.crossData.crossId,
+          // crossId: this.crossData.crossId,
+          crossId: this.crossData.id,
           end: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
           start: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
           laneId: this.value1.join(","),
@@ -532,9 +534,11 @@ export default {
     },
     getData() {
       this.value1 = [];
-      if (this.crossData.crossId) {
+      // if (this.crossData.crossId) {
+      if (this.crossData.id) {
         // todo 获取当前路口所有车道 根据车道 getData
-        initLaneSort({ crossId: this.crossData.crossId }).then((res) => {
+        // initLaneSort({ crossId: this.crossData.crossId }).then((res) => {
+        initLaneSort({ crossId: this.crossData.id }).then((res) => {
           this.options1 = res.content;
           for (let item of this.options1) {
             this.value1.push(item.laneId);