效率评价右下角非机动车效率表格与chart图表联动问题处理

wj-manage-web/src/components/Standard/cesiumMap.vue

@@ -148,7 +148,7 @@ export default {
           cartographic.latitude,
           0.0
         );
-        //偏移后的坐标
+        // 偏移后的坐标
         // let offset = Cesium.Cartesian3.fromRadians(
         //   cartographic.longitude,
         //   cartographic.latitude,

wj-manage-web/src/views/efficiency/index.vue

@@ -147,7 +147,7 @@
                               @change="noVehicleCheckChange"
                               v-model="noVehicleCheckList"
                             >
-                              <el-checkbox
+                              <!-- <el-checkbox
                                 style="width: 100%"
                                 label="机动车道"
                                 v-show="scope.$index === 0"
@@ -161,7 +161,8 @@
                                 style="width: 100%"
                                 label="非机动车闯红灯"
                                 v-show="scope.$index === 2"
-                              ></el-checkbox>
+                              ></el-checkbox> -->
+                              <el-checkbox :label='scope.row.label' style='width: 100%'></el-checkbox>
                             </el-checkbox-group>
                           </template>
                         </el-table-column>
@@ -195,9 +196,6 @@
                         </el-table-column>
                       </el-table>
                     </div>
-                    <!-- <div class="noDataChart" v-show="!tableData.length">
-                      暂无数据
-                    </div> -->
                     <div
                       class="form_chart"
                       v-loading="tab2Loading2"
@@ -691,13 +689,14 @@ export default {
       });
     },
     noVehicleCheckChange(e) {
-      // console.log('noVehicleCheckChange', e)
+      console.log('noVehicleCheckChange', e, this.noVehicleFormCheck, this.noVehicleCheckList)
       let datas = [];
       for (let item of this.noVehicleFormCheck) {
         if (e.includes(item.label)) {
           datas.push(item);
         }
       }
+      console.log('result', datas);
       this.refreshChart(datas, "chart_no_vehicle");
     },
     checkboxChange(e) {
@@ -812,13 +811,14 @@ export default {
           this.tableData = [];
           for (let item of res.content) {
             if ([1, 2, 3].includes(item.type)) {
-              let obj = { total: item.total };
+              let obj = { total: item.total,label:item.label };
               for (let option of item.list) {
                 obj[this.turnMap[option.turnNo]] = option.number;
               }
               this.tableData.push(obj);
             }
           }
+          console.log('tableData', this.tableData);
         });
         noVehicleEfficiency({
           crossId: this.currentCrossId,

wj-manage-web/src/views/situation/index.vue

@@ -288,7 +288,7 @@ export default {
     // 停止实时 clear
     closeRealTime() {
       this.closeAllWs().then(() => {
-        this.clearTrackTimer()
+        this.clearTrackTimer();
         this.writeOffListener();
         window.tb?.clear(null, true);
         window.tb?.update();
@@ -595,12 +595,12 @@ export default {
       }
     },
     switchfirst() {
-        // ELEMENT.Message({
-        //       duration: 0,
-        //       message: "暂无轨迹数据...",
-        //       customClass: "noTrackMessageDialog",
-        //     });
-        lastFrameTime = new Date().getTime()
+      // ELEMENT.Message({
+      //       duration: 0,
+      //       message: "暂无轨迹数据...",
+      //       customClass: "noTrackMessageDialog",
+      //     });
+      lastFrameTime = new Date().getTime();
       trackTimer = setInterval(() => {
         let currentTime = new Date().getTime();
         if (currentTime - lastFrameTime > 60 * 1000) {
@@ -613,7 +613,7 @@ export default {
             window.tb?.clear(null, true);
             window.tb?.update();
             this.lastLocation = [];
-            this.removeLayers('vehiclePic,vehicle,vehicleSelectWave')
+            this.removeLayers("vehiclePic,vehicle,vehicleSelectWave");
           }
         } else {
           if (noTrackMsg) {
@@ -1256,12 +1256,12 @@ export default {
       console.log("sockets...", this.sockets);
       const closePromises = this.sockets.map((socket, index) => {
         return new Promise((resolve) => {
-          socket.ws.onclose = () => {
-            resolve();
-          };
           if (socket.ws.readyState !== 1) {
             resolve();
           } else {
+            socket.ws.onclose = () => {
+              resolve();
+            };
             socket.ws.close();
           }
         });