防撞

src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue

@@ -3,7 +3,7 @@
   <Dialog
     v-model="dialogFormVisible"
     title="编辑路线"
-    width="840"
+    width="960"
     class="map-edit-route-dialog"
     @close="dialogClose"
   >
@@ -138,7 +138,14 @@
       <el-row :gutter="30">
         <el-col :span="12">
           <el-form-item label="正向限速" prop="forwardSpeedLimit" required>
-            <el-input-number style="width: 100%" :step="0.1" controls-position="right" v-model="form.forwardSpeedLimit" :min="0" :max="6">
+            <el-input-number
+              style="width: 100%"
+              :step="0.1"
+              controls-position="right"
+              v-model="form.forwardSpeedLimit"
+              :min="0"
+              :max="6"
+            >
               <template #suffix>
                 <span>m/s</span>
               </template>
@@ -160,7 +167,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="反向限速" prop="reverseSpeedLimit" required>
-            <el-input-number style="width: 100%" :step="0.1"  controls-position="right" v-model="form.reverseSpeedLimit" :min="0" :max="6">
+            <el-input-number
+              style="width: 100%"
+              :step="0.1"
+              controls-position="right"
+              v-model="form.reverseSpeedLimit"
+              :min="0"
+              :max="6"
+            >
               <template #suffix>
                 <span>m/s</span>
               </template>
@@ -220,7 +234,7 @@
             "
             prop="startToEndToward"
             required
-            label-width="180"
+            label-width="240"
           >
             <el-select v-model="form.startToEndToward" placeholder="请选择车头朝向">
               <el-option
@@ -239,7 +253,7 @@
             "
             prop="endToStartToward"
             required
-            label-width="180"
+            label-width="240"
           >
             <el-select v-model="form.endToStartToward" placeholder="请选择车头朝向">
               <el-option
@@ -252,6 +266,16 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="是否开启防撞" prop="collisionAvoidanceFlag" required>
+            <el-select v-model="form.collisionAvoidanceFlag" placeholder="请选择">
+              <el-option label="开启" :value="1" />
+              <el-option label="关闭" :value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
@@ -337,11 +361,11 @@ const rules = reactive({
   expansionZoneRight: [{ required: true, message: '请输入膨胀区域右', trigger: 'blur' }],
   forwardSpeedLimit: [
     { required: true, message: '请输入正向限速', trigger: 'blur' },
-    { type: 'number', min: 0, max: 6, message: '必须大于0且小于6', trigger: 'blur' },
+    { type: 'number', min: 0, max: 6, message: '必须大于0且小于6', trigger: 'blur' }
   ],
   reverseSpeedLimit: [
     { required: true, message: '请输入反向限速', trigger: 'blur' },
-    { type: 'number', min: 0, max: 6, message: '必须大于0且小于6', trigger: 'blur' } ,
+    { type: 'number', min: 0, max: 6, message: '必须大于0且小于6', trigger: 'blur' }
   ]
 })
 

src/views/mapPage/realTimeMap/components/indexPage.vue

@@ -594,10 +594,11 @@ const initWebsocket = () => {
     socketClient.value.onMessage((message) => {
       if (message == 'ping' || message == 'pong') return
       let jsonMsg = JSON.parse(message)
-
       if (jsonMsg.type == 'map_push') {
         requestAnimationFrame(() => {
           let data = JSON.parse(jsonMsg.content)
+          // console.log(data)
+
           let dataList = Object.entries(data).map(([key, value]) => ({
             macAddress: key,
             data: JSON.parse(value)