mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

情报板提交修改

wangqin
Joe 10 months ago
parent
71b151fa50
commit
5fc52c2ee7
3 changed files with 123 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  2. 110
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  3. 56
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue

7
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
View File

@ -28,7 +28,8 @@
<!-- <ControlCamera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 0" /> -->
<!-- 摄像机 G35 K094+079 下行（可控） 枪机 可打开-->
<!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> -->
<component :dialogData="dialogConfig.data" :is="dialogConfig.component" @change="handleCameraChange" />
<component :dialogData="dialogConfig.data" :device="dialogConfig.data" :is="dialogConfig.component"
@change="handleCameraChange" />
</Bg1>
</template>
@ -41,6 +42,7 @@ import Bg1 from "@screen/components/Decorations/bg-1.vue"
import ControlCamera from "./../Dialogs/ControlCamera/index.vue"
import DrivingGuidance from "./../Dialogs/DrivingGuidance/index.vue"
import Camera from "./../Dialogs/Camera/index.vue";
import InfoBoard from "./../InfoBoard"
export default {
name: 'RoadAndEvents',
@ -48,6 +50,7 @@ export default {
ControlCamera,
Camera,
DrivingGuidance,
InfoBoard,
Bg1
},
data() {
@ -61,7 +64,7 @@ export default {
// 0 有 可控（球机） ControlCamera | 1 ⽆ 不可控（枪机） Camera
component: void 0,
data: void 0,
// component: DrivingGuidance,
// component: ControlCamera,
// data: {
// camId: "57937",
// }

110
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
View File

@ -33,11 +33,64 @@ export const eventMap = {
// status: "0",
// };
const data = await getDeviceList(1);
// const data = await getDeviceList(1);
const data = [
{
longitude: 116.268564,
latitude: 35.73115,
otherConfig: '{"ptzCtrl":0}',
},
{
longitude: 116.258178,
latitude: 35.720996,
},
{
longitude: 116.255542,
latitude: 35.717335,
},
{
longitude: 116.252883,
latitude: 35.713114,
},
{
longitude: 116.249416,
latitude: 35.707627,
},
];
if (!data) return;
cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
cacheRemoveFunc.DriveTestEquipment_Camera_Remove = await setMarkToMap.call(
this,
item,
data,
(extData) => {
try {
this.dialogConfig = {
// 0 有（球机） 1 ⽆（枪机）
component: cameraCtrlMap[JSON.parse(extData.otherConfig)?.ptzCtrl],
data: extData,
};
} catch (error) {}
}
);
},
async "路测设备/摄像机_close"() {
cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
},
async "路测设备/行车诱导_close"() {
cacheRemoveFunc.Driving_Guidance_Remove?.();
},
async "路测设备/行车诱导"(item) {
const data = await getDeviceList(12);
// const data = [
// {
// longitude: 116.268564,
// latitude: 35.73115,
// otherConfig: '{"ptzCtrl":0}',
// },
// {
// longitude: 116.258178,
@ -54,43 +107,60 @@ export const eventMap = {
// {
// longitude: 116.249416,
// latitude: 35.707627,
// ptzCtrl: 0,
// },
// ];
if (!data) return;
cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
cacheRemoveFunc.Driving_Guidance_Remove?.();
cacheRemoveFunc.DriveTestEquipment_Camera_Remove = await setMarkToMap.call(
cacheRemoveFunc.Driving_Guidance_Remove = await setMarkToMap.call(
this,
item,
data,
(extData) => {
try {
this.dialogConfig = {
// 0 有（球机） 1 ⽆（枪机）
component: cameraCtrlMap[JSON.parse(extData.otherConfig)?.ptzCtrl],
data: extData,
};
} catch (error) {}
this.dialogConfig = {
component: "DrivingGuidance",
data: extData,
};
}
);
},
async "路测设备/摄像机_close"() {
cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
async "路测设备/情报板_close"() {
cacheRemoveFunc.Info_Board_Remove?.();
},
async "路测设备/行车诱导_close"() {
cacheRemoveFunc.Driving_Guidance_Remove?.();
},
async "路测设备/行车诱导"(item) {
const data = await getDeviceList(12);
async "路测设备/情报板"(item) {
const data = await getDeviceList(2);
// const data = [
// {
// longitude: 116.268564,
// latitude: 35.73115,
// otherConfig: '{"ptzCtrl":0}',
// },
// {
// longitude: 116.258178,
// latitude: 35.720996,
// },
// {
// longitude: 116.255542,
// latitude: 35.717335,
// },
// {
// longitude: 116.252883,
// latitude: 35.713114,
// },
// {
// longitude: 116.249416,
// latitude: 35.707627,
// },
// ];
if (!data) return;
cacheRemoveFunc.Driving_Guidance_Remove?.();
cacheRemoveFunc.Info_Board_Remove?.();
cacheRemoveFunc.Driving_Guidance_Remove = await setMarkToMap.call(
cacheRemoveFunc.Info_Board_Remove = await setMarkToMap.call(
this,
item,
data,

56
ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
View File

@ -15,7 +15,7 @@
<ConditionStatistics class="content-r card-menu" />
</section>
<InfoBoard :visible.sync="isShowInfoBoard" :device="selectedDevice"></InfoBoard>
<!-- <InfoBoard :visible.sync="isShowInfoBoard" :device="selectedDevice"></InfoBoard> -->
<footer class="footer card-menu">
<div class="footer-title">
@ -37,7 +37,7 @@ import ConditionStatistics from "./components/ConditionStatistics/index.vue";
import RoadAndEvents from "./components/RoadAndEvents/index.vue";
import AMapContainer from "./components/AMapContainer/index.vue";
import InfoBoard from "./components/InfoBoard"
// import InfoBoard from "./components/InfoBoard"
export default {
name: 'Home',
@ -47,12 +47,12 @@ export default {
Thumbnail,
RoadAndEvents,
AMapContainer,
InfoBoard
// InfoBoard
},
data() {
return {
isShowInfoBoard: false,
selectedDevice:null
selectedDevice: null
}
},
provide() {
@ -77,30 +77,30 @@ export default {
}
},
onClickItem(item) {
if (item.title.includes("情报板")) {
this.isShowInfoBoard = true;
this.selectedDevice = {
"id": 904,
"iotDeviceId": "81221-65535",
"groupId": null,
"productId": 0,
"stakeMarkId": "k71+600",
"direction": "1",
"deviceName": "大学城入口站前板",
"deviceType": 2,
"installationDate": null,
"productionDate": null,
"durableYears": null,
"installationSite": null,
"useState": null,
"otherConfig": "{\"screenSize\":\"160*80\"}",
"remark": null,
"createTime": "2024-01-17T22:50:56.000+08:00",
"updateTime": null,
"longitude": null,
"latitude": null
}
}
// if (item.title.includes("情报板")) {
// this.isShowInfoBoard = true;
// this.selectedDevice = {
// "id": 904,
// "iotDeviceId": "81221-65535",
// "groupId": null,
// "productId": 0,
// "stakeMarkId": "k71+600",
// "direction": "1",
// "deviceName": "大学城入口站前板",
// "deviceType": 2,
// "installationDate": null,
// "productionDate": null,
// "durableYears": null,
// "installationSite": null,
// "useState": null,
// "otherConfig": "{\"screenSize\":\"160*80\"}",
// "remark": null,
// "createTime": "2024-01-17T22:50:56.000+08:00",
// "updateTime": null,
// "longitude": null,
// "latitude": null
// }
// }
}
}
}

Write Preview
Loading…
Cancel
Save