增加设备任务显示、修改路口图层顺序

CMakeLists.txt

@@ -7,8 +7,8 @@ set (CMAKE_CXX_STANDARD     11)
 
 # Version.
 set (MAJOR_VERSION "1")
-set (MINOR_VERSION "1")
-set (PATCH_VERSION "9")
+set (MINOR_VERSION "2")
+set (PATCH_VERSION "0")
 
 # Import cmake modules.
 list (APPEND    CMAKE_MODULE_PATH   "$ENV{HT_BUILDSYS_CMAKE_MODULES}")

public/config.json

 {
-    "SERVICE_IP": "192.168.92.153:1234",
+    "SERVICE_IP": "192.168.109.84:1234",
     "LOG_SERVE_IP":"192.168.93.87:8020",
     "MAP_CENTER": [39.74441007068,111.24544532751],
     "version": "1.1.4"

src/js/socket/index.js

@@ -460,6 +460,8 @@ export default class Socket {
             case '/setting/ignoreObstaclesAck':
                 this.dealObstaclesAck(msg)
                 break
+            case '/vehicle/paraminfo':
+                console.log(msg)
             default: 
                 this.vehicleStore.setData(name, msg)
                 break

src/views/map/MapLeaflet.vue

@@ -222,6 +222,13 @@
         }
     }
 
+    function dealRunablearea(value) {
+        let {features} = value
+        let data = features.sort((pre, cur) => pre.properties.type - cur.properties.type)
+        value.features = data
+        return value
+    }
+
     function dealMapLayer(value, color, layerName) {
         if (!value || !map) return
 
@@ -233,22 +240,33 @@
             delete mapLayers[layerName]
         }
 
+        if (layerName === 'runablearea') {
+            result = dealRunablearea(result)
+        }
+
         let layer = L.geoJSON(result, {
                     style: function (feature) {
-                        if(layerName === 'barricade'){
+                        if (layerName === 'barricade') {
                             return {
                                 color: '#0066ff',
                                 opacity: 1,
                                 width:5
                             }
-                        }else{
+                        } else if (layerName === 'runablearea') {
+                            return {
+                                color: feature.properties.color,
+                                opacity: 1,
+                                fillColor: feature.properties.type == 4 ? '#4682B4' : feature.properties.color,
+                                fillOpacity: .5
+                            }
+                        } else {
                             return {
                                 color: layerName === 'lane' ? '#eee' : feature.properties.color,
                                 opacity: layerName === 'lane' ? .5 : 1,
                                 fillColor: layerName === 'electronicFence'
                                     ? feature.properties.color
                                     : color ? color : feature.properties.color,
-                            fillOpacity: layerName === 'runablearea' ? .5 : .7
+                                fillOpacity: .7
                             }
                         }
                     },

src/views/map/PairDevice.vue

@@ -8,6 +8,7 @@
             <img :src="`/image/${item.icon}.png`" alt="">
             <span>{{pairingsMsg[item.name]}}</span>
         </p>
+        <p class="loading-type">{{ loadingType }}</p>
     </div>
 </template>
 
@@ -28,9 +29,12 @@
     ]
     const pairingsVehicle = markRaw(PAIRINGS_VEHICLE)
     const vehicleStore = useVehicleStore()
-    const { currentLoadthread, pairinfo } = storeToRefs(vehicleStore)
+    const { currentLoadthread, pairinfo, statusinfo } = storeToRefs(vehicleStore)
     const loadThread = computed(() => currentLoadthread.value)
     const pairingsMsg = computed(() => pairinfo.value)
+    const loadingType = computed(() => {
+        return statusinfo.value.currAssignment ? `(${statusinfo.value.currAssignment})` : ''
+    })
 </script>
 
 <style lang="less" scoped>
@@ -55,5 +59,9 @@
         p:nth-child(1) {
             color: #eaba37
         }
+        .loading-type {
+            color: #eaba37;
+            font-weight: 700;
+        }
     }
 </style>
\ No newline at end of file