Commit 04574f44 authored by 李玲燕's avatar 李玲燕

释放路权

parent 117d1eb4
{ {
"SERVICE_IP": "172.16.0.166:1234", "SERVICE_IP": "192.168.93.178:1234",
"LOG_SERVE_IP":"192.168.93.87:8020", "LOG_SERVE_IP":"192.168.93.87:8020",
"MAP_CENTER": [39.74441007068,111.24544532751], "MAP_CENTER": [39.74441007068,111.24544532751],
"version": "1.1.4" "version": "1.1.4"
......
...@@ -347,6 +347,15 @@ export default class Socket { ...@@ -347,6 +347,15 @@ export default class Socket {
this.mapStore.setData('nextPathAvailable', available) this.mapStore.setData('nextPathAvailable', available)
path && worker.postMessage({name, msg: path}) path && worker.postMessage({name, msg: path})
break break
case '/vehicle/currPathinfo':
if (Array.isArray(msg)) {
worker.postMessage({name, msg})
} else {
let { available, path } = msg
this.mapStore.setData('currPathAvailable', available)
path && worker.postMessage({name, msg: path})
}
break
default: default:
msg && worker.postMessage({name, msg}) msg && worker.postMessage({name, msg})
break break
......
...@@ -24,7 +24,8 @@ export const useMapStore = defineStore('map', { ...@@ -24,7 +24,8 @@ export const useMapStore = defineStore('map', {
morepath: null, // 单机循迹多路径 morepath: null, // 单机循迹多路径
nextPathinfo: null, nextPathinfo: null,
currPathinfo: null, currPathinfo: null,
nextPathAvailable: null, nextPathAvailable: null, // 下一段路路权
currPathAvailable: null, // 当前路径路权
dynamicPathinfo: null, // 车辆动态路权信息 dynamicPathinfo: null, // 车辆动态路权信息
} }
}, },
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
nextPathinfo, nextPathinfo,
currPathinfo, currPathinfo,
nextPathAvailable, nextPathAvailable,
currPathAvailable,
avoidancePath, // 绕障路径 avoidancePath, // 绕障路径
obstacleData, obstacleData,
dynamicPathinfo, // 车辆动态路权信息 dynamicPathinfo, // 车辆动态路权信息
...@@ -639,7 +640,7 @@ ...@@ -639,7 +640,7 @@
}, {immediate: true, deep: true}) }, {immediate: true, deep: true})
watch(currPathinfo, (value) => { watch(currPathinfo, (value) => {
dealMapPath(value, 'currentPath', '#19ae19') dealMapPath(value, 'currentPath', currPathAvailable.value === 1 ? '#19ae19' : '#8B4513')
adjustmentLayer() adjustmentLayer()
}, {immediate: true, deep: true}) }, {immediate: true, deep: true})
......
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
<Button type="primary" @click="handleSave(7)">加载参数</Button> <Button type="primary" @click="handleSave(7)">加载参数</Button>
<span>触发控制模块重新加载参数</span> <span>触发控制模块重新加载参数</span>
</p> </p>
<p class="c-box b-box">
<Button type="primary" style="margin-right: 10px;" @click="boxDown(13)">释放路权</Button>
<Button type="primary" @click="handleSave(14)">申请路权</Button>
</p>
</div> </div>
<Modal v-model="isShow" <Modal v-model="isShow"
title="提示" title="提示"
...@@ -52,7 +56,7 @@ ...@@ -52,7 +56,7 @@
:mask-closable="false" :mask-closable="false"
@on-ok="handleSave(codeValue)" @on-ok="handleSave(codeValue)"
@on-cancel="boxCancel()"> @on-cancel="boxCancel()">
<p style="text-align: center;">是否执行{{codeText}}指令</p> <p style="text-align: center;">{{codeText}}</p>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -155,7 +159,12 @@ ...@@ -155,7 +159,12 @@
let codeText=ref(''); let codeText=ref('');
function boxDown(val,text){ function boxDown(val,text){
codeValue.value=val; codeValue.value=val;
codeText.value=text; if (val == 13) {
codeText.value = '注意:释放路权可能产生与其他车辆碰撞风险,请务必确保停车位置不影响其他车、且周边车辆都停车后再释放!'
} else {
codeText.value=`是否执行${text}指令`;
}
isShow.value=true; isShow.value=true;
} }
function boxCancel(){ function boxCancel(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment